updated .travis.yml and appveyor.yml for tests/

diff --git a/.travis.yml b/.travis.yml
index 42f0043b2c952aa55436e44d1fc23e8dc210a9ca..350fc1e6b876a666a2edb28f5e325a7041a5515c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
       env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
     - os: linux
       sudo: false
-      env: PLATFORM="Ubuntu 12.04 container" CMD="make -C programs test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest"
+      env: PLATFORM="Ubuntu 12.04 container" CMD="make -C tests test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest"
     - os: linux
       sudo: false
       env: PLATFORM="Ubuntu 12.04 container" CMD="make usan"
@@ -39,7 +39,7 @@ matrix:
             - qemu-user-static
     - os: linux
       sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make -C programs test32"
+      env: PLATFORM="Ubuntu 12.04" CMD="make -C tests test32"
       addons:
         apt:
           packages:
@@ -58,7 +58,7 @@ matrix:
             - gcc-multilib
     - os: linux
       sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make -C programs valgrindTest"
+      env: PLATFORM="Ubuntu 12.04" CMD="make -C tests valgrindTest"
       addons:
         apt:
           packages:

diff --git a/Makefile b/Makefile
index 0d5b1cc2ada551859d67836fba1e9418096319db..a6b2fb42e38297ded7b2de507959d66778e5dbee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ default: zstd
 all:
        $(MAKE) -C $(ZSTDDIR) $@
        $(MAKE) -C $(PRGDIR) $@ zstd32
+       $(MAKE) -C $(TESTDIR) $@ all32
 
 zstd:
        $(MAKE) -C $(PRGDIR)
@@ -102,16 +103,16 @@ clangtest: clean
        $(MAKE) all CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"
 
 armtest: clean
-       $(MAKE) -C $(PRGDIR) datagen   # use native, faster
-       $(MAKE) -C $(PRGDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static"
+       $(MAKE) -C $(TESTDIR) datagen   # use native, faster
+       $(MAKE) -C $(TESTDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static"
 
 ppctest: clean
-       $(MAKE) -C $(PRGDIR) datagen   # use native, faster
-       $(MAKE) -C $(PRGDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-Werror -Wno-attributes -static"
+       $(MAKE) -C $(TESTDIR) datagen   # use native, faster
+       $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-Werror -Wno-attributes -static"
 
 ppc64test: clean
-       $(MAKE) -C $(PRGDIR) datagen   # use native, faster
-       $(MAKE) -C $(PRGDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-m64 -static"
+       $(MAKE) -C $(TESTDIR) datagen   # use native, faster
+       $(MAKE) -C $(TESTDIR) test CC=powerpc-linux-gnu-gcc ZSTDRTTEST= MOREFLAGS="-m64 -static"
 
 usan: clean
        $(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=undefined"
@@ -123,7 +124,7 @@ msan: clean
        $(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=memory -fno-omit-frame-pointer"   # datagen.c fails this test for no obvious reason
 
 asan32: clean
-       $(MAKE) -C $(PRGDIR) test32 CC=clang MOREFLAGS="-g -fsanitize=address"
+       $(MAKE) -C $(TESTDIR) test32 CC=clang MOREFLAGS="-g -fsanitize=address"
 
 uasan: clean
        $(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"
@@ -163,13 +164,13 @@ c11test: clean
        CFLAGS="-std=c11" $(MAKE) all
 
 bmix64test: clean
-       CFLAGS="-O3 -mbmi -Werror" $(MAKE) -C $(PRGDIR) test
+       CFLAGS="-O3 -mbmi -Werror" $(MAKE) -C $(TESTDIR) test
 
 bmix32test: clean
-       CFLAGS="-O3 -mbmi -mx32 -Werror" $(MAKE) -C $(PRGDIR) test
+       CFLAGS="-O3 -mbmi -mx32 -Werror" $(MAKE) -C $(TESTDIR) test
 
 bmi32test: clean
-       CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(PRGDIR) test
+       CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(TESTDIR) test
 
 staticAnalyze: clean
        CPPFLAGS=-g scan-build --status-bugs -v $(MAKE) all

diff --git a/appveyor.yml b/appveyor.yml
index 03fb79306c3ff1b24e085940478093e60e6c7762..4b4ef6c6a0c21e23a4b5f4f9a0e841ef1451b340 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ install:
   - ECHO Installing %COMPILER% %PLATFORM% %CONFIGURATION%
   - if [%COMPILER%]==[gcc] SET PATH_ORIGINAL=%PATH%
   - if [%COMPILER%]==[gcc] (
-      SET "CLANG_PARAMS=-C programs zstd fullbench fuzzer zbufftest paramgrill datagen CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"" &&
+      SET "CLANG_PARAMS=-C tests zstd fullbench fuzzer zbufftest paramgrill datagen CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"" &&
       SET "PATH_MINGW32=c:\MinGW\bin;c:\MinGW\usr\bin" &&
       SET "PATH_MINGW64=c:\msys64\mingw64\bin;c:\msys64\usr\bin" &&
       COPY C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe &&

diff --git a/tests/Makefile b/tests/Makefile
index bbe6f183a049b247721916c8340ca09882390f57..e0689ce672ec1f4f0022e50524120dd0d62a1e57 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 # ##########################################################################
-# ZSTD programs - Makefile
+# ZSTD tests - Makefile
 # Copyright (C) Yann Collet 2015-2016
 #
 # GPL v2 License
@@ -21,7 +21,6 @@
 # You can contact the author at :
 #  - zstd homepage : http://www.zstd.net/
 # ##########################################################################
-# zstd : Command Line Utility, supporting gzip-like arguments
 # datagen : Synthetic and parametrable data generator, for tests
 # fuzzer  : Test tool, to check zstd integrity on target platform
 # fuzzer32: Same as fuzzer, but forced to compile in 32-bits mode
@@ -36,9 +35,9 @@ PREFIX ?= /usr/local
 BINDIR  = $(PREFIX)/bin
 MANDIR  = $(PREFIX)/share/man/man1
 ZSTDDIR = ../lib
+PRGDIR  = ../programs
 
-
-CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
+CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PRGDIR)
 CFLAGS ?= -O3
 CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef
@@ -68,54 +67,55 @@ ZBUFFTEST = -T2mn
 FUZZERTEST= -T5mn
 ZSTDRTTEST= --test-large-data
 
-.PHONY: default all all32 clean install uninstall test test32 test-all
+.PHONY: default all all32 clean test test32 test-all
+
+default: fullbench
 
-default: zstd
+all: fullbench fuzzer zbufftest zstreamtest paramgrill datagen
 
-all: zstd fullbench fuzzer zbufftest zstreamtest paramgrill datagen
+all32: fullbench32 fuzzer32 zbufftest32 zstreamtest32
 
-all32: zstd32 fullbench32 fuzzer32 zbufftest32 zstreamtest32
 
 
+zstd:
+       $(MAKE) -C $(PRGDIR) $@
 
-zstd  : $(ZSTD_FILES) $(ZDICT_FILES) \
-        zstdcli.c fileio.c bench.c datagen.c dibio.c
-       $(CC)      $(FLAGS) -DZSTD_LEGACY_SUPPORT=0 $^ -o $@$(EXT)
+zstd32:
+       $(MAKE) -C $(PRGDIR) $@
 
-zstd32 : $(ZSTD_FILES) $(ZDICT_FILES) \
-        zstdcli.c fileio.c bench.c datagen.c dibio.c
-       $(CC)  -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=0 $^ -o $@$(EXT)
+zstd_nolegacy:
+       $(MAKE) -C $(PRGDIR) $@
 
-fullbench  : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c fullbench.c
+fullbench  : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c fullbench.c
        $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
-fullbench32 : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c fullbench.c
+fullbench32 : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c fullbench.c
        $(CC)  -m32  $(FLAGS) $^ -o $@$(EXT)
 
 fuzzer  : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder
-fuzzer  : $(ZSTD_FILES) $(ZDICT_FILES) datagen.c fuzzer.c
+fuzzer  : $(ZSTD_FILES) $(ZDICT_FILES) $(PRGDIR)/datagen.c fuzzer.c
        $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
 fuzzer32 : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder
-fuzzer32 : $(ZSTD_FILES) $(ZDICT_FILES) datagen.c fuzzer.c
+fuzzer32 : $(ZSTD_FILES) $(ZDICT_FILES) $(PRGDIR)/datagen.c fuzzer.c
        $(CC)  -m32  $(FLAGS) $^ -o $@$(EXT)
 
-zbufftest  : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c zbufftest.c
+zbufftest  : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c zbufftest.c
        $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
-zbufftest32  : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c zbufftest.c
+zbufftest32  : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c zbufftest.c
        $(CC)  -m32  $(FLAGS) $^ -o $@$(EXT)
 
-zstreamtest  : $(ZSTD_FILES) datagen.c zstreamtest.c
+zstreamtest  : $(ZSTD_FILES) $(PRGDIR)/datagen.c zstreamtest.c
        $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
-zstreamtest32 : $(ZSTD_FILES) datagen.c zstreamtest.c
+zstreamtest32 : $(ZSTD_FILES) $(PRGDIR)/datagen.c zstreamtest.c
        $(CC) -m32  $(FLAGS) $^ -o $@$(EXT)
 
-paramgrill : $(ZSTD_FILES) datagen.c paramgrill.c
+paramgrill : $(ZSTD_FILES) $(PRGDIR)/datagen.c paramgrill.c
        $(CC)      $(FLAGS) $^ -lm -o $@$(EXT)
 
-datagen : datagen.c datagencli.c
+datagen : $(PRGDIR)/datagen.c datagencli.c
        $(CC)      $(FLAGS) $^ -o $@$(EXT)
 
 roundTripCrash : $(ZSTD_FILES) roundTripCrash.c
@@ -124,7 +124,7 @@ roundTripCrash : $(ZSTD_FILES) roundTripCrash.c
 clean:
        $(MAKE) -C ../lib clean
        @rm -f core *.o tmp* result* *.gcda dictionary *.zst \
-        zstd$(EXT) zstd32$(EXT) \
+        $(PRGDIR)/zstd$(EXT) $(PRGDIR)/zstd32$(EXT) \
         fullbench$(EXT) fullbench32$(EXT) \
         fuzzer$(EXT) fuzzer32$(EXT) zbufftest$(EXT) zbufftest32$(EXT) \
         datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT)
@@ -141,12 +141,12 @@ valgrindTest: VALGRIND = valgrind --leak-check=full --error-exitcode=1
 valgrindTest: zstd datagen fuzzer fullbench zbufftest
        @echo "\n ---- valgrind tests : memory analyzer ----"
        $(VALGRIND) ./datagen -g50M > $(VOID)
-       $(VALGRIND) ./zstd ; if [ $$? -eq 0 ] ; then echo "zstd without argument should have failed"; false; fi
-       ./datagen -g80 | $(VALGRIND) ./zstd - -c > $(VOID)
-       ./datagen -g16KB | $(VALGRIND) ./zstd -vf - -o $(VOID)
-       ./datagen -g2930KB | $(VALGRIND) ./zstd -5 -vf - -o tmp
-       $(VALGRIND) ./zstd -vdf tmp -o $(VOID)
-       ./datagen -g64MB | $(VALGRIND) ./zstd -vf - -o $(VOID)
+       $(VALGRIND) $(PRGDIR)/zstd ; if [ $$? -eq 0 ] ; then echo "zstd without argument should have failed"; false; fi
+       ./datagen -g80 | $(VALGRIND) $(PRGDIR)/zstd - -c > $(VOID)
+       ./datagen -g16KB | $(VALGRIND) $(PRGDIR)/zstd -vf - -o $(VOID)
+       ./datagen -g2930KB | $(VALGRIND) $(PRGDIR)/zstd -5 -vf - -o tmp
+       $(VALGRIND) $(PRGDIR)/zstd -vdf tmp -o $(VOID)
+       ./datagen -g64MB | $(VALGRIND) $(PRGDIR)/zstd -vf - -o $(VOID)
        @rm tmp
        $(VALGRIND) ./fuzzer -T1mn -t1
        $(VALGRIND) ./fullbench -i1
@@ -173,13 +173,13 @@ test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zbuff32 test-zstream32
 
 test-all: test test32 valgrindTest
 
-test-zstd: ZSTD = ./zstd
+test-zstd: ZSTD = $(PRGDIR)/zstd
 test-zstd: zstd zstd-playTests
 
-test-zstd32: ZSTD = ./zstd32
+test-zstd32: ZSTD = $(PRGDIR)/zstd32
 test-zstd32: zstd32 zstd-playTests
 
-test-zstd_nolegacy: ZSTD = ./zstd
+test-zstd_nolegacy: ZSTD = $(PRGDIR)/zstd
 test-zstd_nolegacy: zstd_nolegacy zstd-playTests
 
 test-fullbench: fullbench datagen