From 1dcb2ff23f6485c7ccfba49c6b164e79a61ae99e Mon Sep 17 00:00:00 2001 From: inikep Date: Mon, 30 May 2016 11:33:52 +0200 Subject: [PATCH] improved scripts compatibility --- appveyor.yml | 8 ++++---- programs/playTests.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 07c55964..724d0136 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 da1fee96..189d169f 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