diff options
| -rw-r--r-- | circle.yml | 16 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
2 files changed, 9 insertions, 9 deletions
@@ -3,7 +3,7 @@ dependencies: - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get -y -qq update - sudo apt-get -y install qemu-system-ppc qemu-user-static gcc-powerpc-linux-gnu - sudo apt-get -y install qemu-system-arm gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - - sudo apt-get -y install libc6-dev-i386 clang gcc-5 gcc-6 valgrind + - sudo apt-get -y install libc6-dev-i386 clang gcc-5 gcc-5-multilib gcc-6 valgrind test: override: @@ -17,13 +17,13 @@ test: - gcc-6 -v; make -C tests test-lz4 CC=gcc-6 MOREFLAGS=-Werror && make clean # Shorter tests - make cmake && make clean - - make test-lz4 - - make test-lz4c - - make test-fasttest - - make test-frametest - - make test-fullbench - - make test-fuzzer && make clean - - make -C lib all && make -C tests fullbench-dll && make clean + - make -C tests test-lz4 + - make -C tests test-lz4c + - make -C tests test-fasttest + - make -C tests test-frametest + - make -C tests test-fullbench + - make -C tests test-fuzzer && make clean + - make -C lib all && make clean - pyenv global 3.4.4; make versionsTest && make clean - make travis-install && make clean # Longer tests diff --git a/tests/Makefile b/tests/Makefile index d1117c6..e362626 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -78,7 +78,7 @@ lz4c: $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="$(CFLAGS)" lz4c32: # create a 32-bits version for 32/64 interop tests - $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)" + $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS) -I/usr/include/x86_64-linux-gnu" cp $(LZ4) $(LZ4)c32 fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c |