From: inikep <inikep@gmail.com>
Date: Mon, 30 May 2016 09:33:52 +0000 (+0200)
Subject: improved scripts compatibility
X-Git-Tag: v0.7.0^2~37^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dcb2ff23f6485c7ccfba49c6b164e79a61ae99e;p=thirdparty%2Fzstd.git

improved scripts compatibility
---

diff --git a/appveyor.yml b/appveyor.yml
index 07c559649..724d0136e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -80,7 +80,7 @@ build_script:
       ECHO *** &&
       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%\*.exe projects\
+      COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe programs\
     )
 
 test_script:
@@ -91,9 +91,9 @@ test_script:
     )
   - if [%COMPILER%]==[visual] if [%CONFIGURATION%]==[Release] (
       CD programs &&
-      SET ZSTD=..\projects\zstd.exe &&
-      SET DATAGEN=..\projects\datagen.exe &&
-      sh playTests.sh --test-large-data &&
+      SET ZSTD=./zstd.exe &&
+      SET DATAGEN=./datagen.exe &&
+      sh -e playTests.sh --test-large-data &&
       CD .. &&
       projects\fullbench.exe -i1 &&
       projects\fullbench.exe -i1 -P0 &&
diff --git a/programs/playTests.sh b/programs/playTests.sh
index da1fee968..189d169f5 100755
--- a/programs/playTests.sh
+++ b/programs/playTests.sh
@@ -30,15 +30,15 @@ case "$OS" in
 esac
 
 MD5SUM="md5sum"
-if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     MD5SUM="md5 -r"
 fi
 
-$ECHO "\nStarting playTests.sh isWindows=$isWindows"
-file $ZSTD
+$ECHO "\nStarting playTests.sh isWindows=$isWindows TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
 
 [ -n "$ZSTD" ] || die "ZSTD variable must be defined!"
 
+file $ZSTD
 $ECHO "\n**** simple tests **** "
 
 ./datagen > tmp