AppVeyor tests use playTests.bat

diff --git a/appveyor.yml b/appveyor.yml
index a68e12eab304caa46d0e6c9ea91a5d672d06c51d..c6f735ea3e1c15b7ec1148f4fcc923c0508cf998 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,28 +1,29 @@
 version: 1.0.{build}
 environment:
   matrix:
-  - ZSTD_APPVEYOR: "gcc"
-    MAKE_PARAMS: "test"
-    PLATFORM: "mingw32"
-  - ZSTD_APPVEYOR: "gcc"
-    MAKE_PARAMS: "test"
-    PLATFORM: "mingw64"
-  - ZSTD_APPVEYOR: "visual"
-    CONFIGURATION: "Debug"
+  - COMPILER: "visual"
+    CONFIGURATION: "Release"
     PLATFORM: "Win32"
-  - ZSTD_APPVEYOR: "visual"
+  - COMPILER: "visual"
     CONFIGURATION: "Release"
+    PLATFORM: "x64"
+  - COMPILER: "visual"
+    CONFIGURATION: "Debug"
     PLATFORM: "Win32"
-  - ZSTD_APPVEYOR: "visual"
+  - COMPILER: "visual"
     CONFIGURATION: "Debug"
     PLATFORM: "x64"
-  - ZSTD_APPVEYOR: "visual"
-    CONFIGURATION: "Release"
-    PLATFORM: "x64"
+  - COMPILER: "gcc"
+    MAKE_PARAMS: "test"
+    PLATFORM: "mingw32"
+  - COMPILER: "gcc"
+    MAKE_PARAMS: "test"
+    PLATFORM: "mingw64"
 
 install:
-  - if [%ZSTD_APPVEYOR%]==[gcc] SET PATH_ORIGINAL=%PATH%
-  - if [%ZSTD_APPVEYOR%]==[gcc] (
+  - 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 "PATH_MINGW32=c:\MinGW\bin;c:\MinGW\usr\bin" &&
       SET "PATH_MINGW64=c:\msys64\mingw64\bin;c:\msys64\usr\bin" &&
@@ -32,7 +33,7 @@ install:
     )
 
 build_script:
-  - ECHO Building %ZSTD_APPVEYOR%
+  - ECHO Building %COMPILER% %PLATFORM% %CONFIGURATION%
   - if [%PLATFORM%]==[mingw32] SET PATH=%PATH_MINGW32%;%PATH_ORIGINAL% 
   - if [%PLATFORM%]==[mingw64] SET PATH=%PATH_MINGW64%;%PATH_ORIGINAL% 
   - if [%PLATFORM%]==[mingw64] (
@@ -45,7 +46,7 @@ build_script:
       COPY programs\fuzzer.exe projects\fuzzer_clang.exe &&
       make clean
     )
-  - if [%ZSTD_APPVEYOR%]==[gcc] (
+  - if [%COMPILER%]==[gcc] (
       ECHO *** &&
       ECHO *** Building %PLATFORM% &&
       ECHO *** &&
@@ -53,7 +54,7 @@ build_script:
       make %MAKE_PARAMS% &&
       make clean
     )
-  - if [%ZSTD_APPVEYOR%]==[visual] (
+  - if [%COMPILER%]==[visual] (
       ECHO *** &&
       ECHO *** Building Visual Studio 2008 %PLATFORM%\%CONFIGURATION% &&
       ECHO *** &&
@@ -62,7 +63,7 @@ build_script:
       ECHO *** &&
       ECHO *** Building Visual Studio 2010 %PLATFORM%\%CONFIGURATION% &&
       ECHO *** &&
-      msbuild "projects\VS2010\zstd.sln" %ADDITIONALPARAM% /m /verbosity:normal /property:PlatformToolset=v100 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
+      msbuild "projects\VS2010\zstd.sln" %ADDITIONALPARAM% /m /verbosity:minimal /property:PlatformToolset=v100 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
       COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2010_%PLATFORM%_%CONFIGURATION%.exe &&
       ECHO *** &&
       ECHO *** Building Visual Studio 2012 %PLATFORM%\%CONFIGURATION% &&
@@ -77,25 +78,28 @@ build_script:
       ECHO *** &&
       ECHO *** Building Visual Studio 2015 %PLATFORM%\%CONFIGURATION% &&
       ECHO *** &&
-      msbuild "projects\VS2010\zstd.sln" /m /verbosity:normal /property:PlatformToolset=v140 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
+      msbuild "projects\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v140 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
       COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2015_%PLATFORM%_%CONFIGURATION%.exe &&
-      COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\zstd.exe projects\zstd_VS2015_%PLATFORM%_%CONFIGURATION%.exe &&
-      COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\datagen.exe projects\datagen_VS2015_%PLATFORM%_%CONFIGURATION%.exe
+      COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe projects\
     )
 
 test_script:
+  - ECHO Testing %COMPILER% %PLATFORM% %CONFIGURATION%
   - SET FUZZERTEST=-T1mn
-  - if [%ZSTD_APPVEYOR%]==[gcc] (
+  - if [%COMPILER%]==[gcc] (
       if [%PLATFORM%]==[mingw64] projects\fuzzer_clang.exe %FUZZERTEST%
     )
-  - if [%ZSTD_APPVEYOR%]==[visual] if [%CONFIGURATION%]==[Release] (
+  - if [%COMPILER%]==[visual] if [%CONFIGURATION%]==[Release] (
+      CD programs &&
+      SET ZSTD=..\projects\zstd.exe &&
+      SET DATAGEN=..\projects\datagen.exe &&
+      CALL tests\playTests.bat --test-large-data &&
+      CD .. &&
+      projects\fullbench.exe -i1 &&
+      projects\fullbench.exe -i1 -P0 &&
       projects\fuzzer_VS2008_%PLATFORM%_Release.exe %FUZZERTEST% &&
       projects\fuzzer_VS2010_%PLATFORM%_Release.exe %FUZZERTEST% &&
       projects\fuzzer_VS2012_%PLATFORM%_Release.exe %FUZZERTEST% &&
       projects\fuzzer_VS2013_%PLATFORM%_Release.exe %FUZZERTEST% &&
-      projects\fuzzer_VS2015_%PLATFORM%_Release.exe %FUZZERTEST% &&
-      CD programs &&
-      SET ZSTD=..\projects\zstd_VS2015_%PLATFORM%_Release.exe &&
-      SET DATAGEN=..\projects\datagen_VS2015_%PLATFORM%_Release.exe &&
-      CALL tests\playTests.bat --test-large-data
+      projects\fuzzer_VS2015_%PLATFORM%_Release.exe %FUZZERTEST%
     )

diff --git a/programs/tests/playTests.bat b/programs/tests/playTests.bat
index 6e9fd53ffbbb2f818c177b6593d6eba57fc17a06..edbbcb340d59796bd62850e213e1fb22fa089ebc 100644 (file)
--- a/programs/tests/playTests.bat
+++ b/programs/tests/playTests.bat
@@ -1,6 +1,9 @@
 @echo off
-if [%ZSTD%]==[] echo ZSTD variable must be defined! && exit /b 1
-if [%DATAGEN%]==[] echo DATAGEN variable must be defined! && exit /b 1
+ECHO Start playTests.bat
+ECHO ZSTD^: %ZSTD%
+ECHO DATAGEN^: %DATAGEN%
+if "%ZSTD%"=="" echo ZSTD variable must be defined! && exit /b 1
+if "%DATAGEN%"=="" echo DATAGEN variable must be defined! && exit /b 1
 
 SET ROUNDTRIPTEST=tests\roundTripTest.bat