From: Yann Collet Date: Tue, 7 Jul 2015 07:58:59 +0000 (-0800) Subject: Travis CI : added ARM compilation tests X-Git-Tag: v0.1.0~3^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7083b8a54aa68ada01ebb7b0aec0857d01b809c4;p=thirdparty%2Fzstd.git Travis CI : added ARM compilation tests --- diff --git a/.travis.yml b/.travis.yml index b0265e4aa..62e818929 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ compiler: gcc script: make test-travis before_install: - sudo apt-get update -qq + - sudo apt-get install -qq gcc-arm-linux-gnueabi - sudo apt-get install -qq clang - sudo apt-get install -qq g++-multilib - sudo apt-get install -qq gcc-multilib @@ -13,6 +14,7 @@ env: - ZSTD_TRAVIS_CI_ENV=test-all - ZSTD_TRAVIS_CI_ENV=clangtest - ZSTD_TRAVIS_CI_ENV=gpptest + - ZSTD_TRAVIS_CI_ENV=armtest matrix: fast_finish: true diff --git a/Makefile b/Makefile index adc6d5e8a..47d727cc9 100644 --- a/Makefile +++ b/Makefile @@ -98,5 +98,11 @@ clangtest: clean gpptest: clean $(MAKE) all CC=g++ CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror" +armtest: clean + cd $(ZSTDDIR); $(MAKE) -e all CC=arm-linux-gnueabi-gcc MOREFLAGS="-Werror" + cd $(PRGDIR); $(MAKE) -e CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror" + +sanitize: clean + $(MAKE) test CC=clang CPPFLAGS="-g -fsanitize=undefined" FUZZER_TIME="-T1mn" NB_LOOPS=-i1 endif diff --git a/lib/Makefile b/lib/Makefile index 4d838167b..46000f7f9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,7 +41,9 @@ LIBVER = $(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) DESTDIR?= PREFIX ?= /usr CFLAGS ?= -O3 -CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes +CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes +LDFLAGS = -I. +FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS) LIBDIR ?= $(PREFIX)/lib INCLUDEDIR=$(PREFIX)/include @@ -67,10 +69,10 @@ all: libzstd libzstd: zstd.c @echo compiling static library - @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ + @$(CC) $(FLAGS) -c $^ @$(AR) rcs libzstd.a zstd.o @echo compiling dynamic library $(LIBVER) - @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) + @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) @echo creating versioned links @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR) @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT) diff --git a/programs/Makefile b/programs/Makefile index c621b6861..0526c36c8 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -122,14 +122,14 @@ test32: test-zstd32 test-fullbench32 test-fuzzer32 test-all: test test32 test-zstd: zstd datagen - ./datagen | ./zstd -v | ./zstd -d > $(VOID) - ./datagen -g256MB | ./zstd -v | ./zstd -d > $(VOID) - ./datagen -g6GB | ./zstd -vq | ./zstd -d > $(VOID) + ./datagen | ./zstd -v | ./zstd -d > $(VOID) + ./datagen -g256MB | ./zstd -v | ./zstd -d > $(VOID) + ./datagen -g6GB -P99 | ./zstd -vq | ./zstd -d > $(VOID) test-zstd32: zstd32 datagen - ./datagen | ./zstd32 -v | ./zstd32 -d > $(VOID) - ./datagen -g256MB | ./zstd32 -v | ./zstd32 -d > $(VOID) - ./datagen -g6GB | ./zstd32 -vq | ./zstd32 -d > $(VOID) + ./datagen | ./zstd32 -v | ./zstd32 -d > $(VOID) + ./datagen -g256MB | ./zstd32 -v | ./zstd32 -d > $(VOID) + ./datagen -g6GB -P99 | ./zstd32 -vq | ./zstd32 -d > $(VOID) test-fullbench: fullbench datagen ./fullbench -i1