summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Terrell <terrelln@fb.com>2018-05-04 21:33:59 (GMT)
committerNick Terrell <terrelln@fb.com>2018-05-04 21:33:59 (GMT)
commit3e7fa1b14d9a5fc7f10c36231ef5cd2ba3ac7350 (patch)
tree0b5439e675c72577ead03358ae3db61531d61c80
parenta7cc0b590a634e3c2612976c1dc83e74f8448d43 (diff)
downloadlz4-3e7fa1b14d9a5fc7f10c36231ef5cd2ba3ac7350.zip
lz4-3e7fa1b14d9a5fc7f10c36231ef5cd2ba3ac7350.tar.gz
lz4-3e7fa1b14d9a5fc7f10c36231ef5cd2ba3ac7350.tar.bz2
Attempt to fix travis
-rw-r--r--tests/Makefile5
-rwxr-xr-xtests/test_install.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 196426e..d238561 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -71,6 +71,9 @@ all32: all
lz4:
$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)"
+lib liblz4.pc:
+ $(MAKE) -C $(LZ4DIR) $@ CFLAGS="$(CFLAGS)"
+
lz4c unlz4 lz4cat: lz4
ln -sf $(LZ4) $(PRGDIR)/$@
@@ -146,7 +149,7 @@ test: test-lz4 test-lz4c test-frametest test-fullbench test-fuzzer test-install
test32: CFLAGS+=-m32
test32: test
-test-install:
+test-install: lz4 lib liblz4.pc
lz4_root=.. ./test_install.sh
test-lz4-sparse: lz4 datagen
diff --git a/tests/test_install.sh b/tests/test_install.sh
index 2e1a5a5..f9de402 100755
--- a/tests/test_install.sh
+++ b/tests/test_install.sh
@@ -2,7 +2,6 @@
set -e
make="make -C $lz4_root"
-$make CFLAGS=-O0 > /dev/null
for cmd in install uninstall; do
for upper in DUMMY PREFIX EXEC_PREFIX LIBDIR INCLUDEDIR PKGCONFIGDIR BINDIR MANDIR MAN1DIR ; do
lower=$(echo $upper | tr '[:upper:]' '[:lower:]')