summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2016-11-17 22:02:01 (GMT)
committerYann Collet <cyan@fb.com>2016-11-17 22:02:01 (GMT)
commit279344a177c3e472932bad8844ce62ba41868690 (patch)
treedcc972a915f776619c4a22443964ac755e4bf75a
parent1abecbc33c8ec5b84d2623dcbe73136aeb99db37 (diff)
downloadlz4-279344a177c3e472932bad8844ce62ba41868690.zip
lz4-279344a177c3e472932bad8844ce62ba41868690.tar.gz
lz4-279344a177c3e472932bad8844ce62ba41868690.tar.bz2
fixed Travis test cases
-rw-r--r--.travis.yml4
-rw-r--r--Makefile12
2 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 48ccbc6..e5db749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,11 @@ matrix:
- os: linux
sudo: false
- env: Ubu=12.04cont Cmd="make gpptest-native && make clean examples && make clean cmake && make clean travis-install && make clean clangtest-native" COMPILER=cc
+ env: Ubu=12.04cont Cmd="make gpptest && make clean examples && make clean cmake && make clean travis-install && make clean clangtest" COMPILER=cc
# 14.04 LTS Server Edition 64 bit
- - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc
+ - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 clean versionsTest' COMPILER=cc
dist: trusty
sudo: required
addons:
diff --git a/Makefile b/Makefile
index cbf0932..be662a5 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,8 @@ platformTest: clean
@echo "\n ---- test lz4 with $(CC) compiler ----"
@$(CC) -v
CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all
- CFLAGS="-O3 -Werror -static" $(MAKE) -C $(PRGDIR) native
- CFLAGS="-O3 -Werror -static" $(MAKE) -C $(TESTDIR) native
+ CFLAGS="-O3 -Werror -static" $(MAKE) -C $(PRGDIR) all
+ CFLAGS="-O3 -Werror -static" $(MAKE) -C $(TESTDIR) all
$(MAKE) -C $(TESTDIR) test-platform
versionsTest: clean
@@ -151,11 +151,11 @@ gpptest: clean
CC=g++ $(MAKE) -C $(PRGDIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
CC=g++ $(MAKE) -C $(TESTDIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
-gpptest-native: clean
+gpptest32: clean
g++ -v
- CC=g++ $(MAKE) -C $(LZ4DIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(PRGDIR) native CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(TESTDIR) native CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
+ CC=g++ $(MAKE) -C $(LZ4DIR) all CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
+ CC=g++ $(MAKE) -C $(PRGDIR) native CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
+ CC=g++ $(MAKE) -C $(TESTDIR) native CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
c_standards: clean
$(MAKE) all MOREFLAGS="-std=gnu90 -Werror"