improved scripts compatibility

This commit is contained in:
inikep 2016-05-30 11:33:52 +02:00
parent 957d678031
commit 1dcb2ff23f
2 changed files with 7 additions and 7 deletions

View File

@ -80,7 +80,7 @@ build_script:
ECHO *** && ECHO *** &&
msbuild "projects\VS2010\zstd.sln" /m /verbosity:minimal /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%\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: test_script:
@ -91,9 +91,9 @@ test_script:
) )
- if [%COMPILER%]==[visual] if [%CONFIGURATION%]==[Release] ( - if [%COMPILER%]==[visual] if [%CONFIGURATION%]==[Release] (
CD programs && CD programs &&
SET ZSTD=..\projects\zstd.exe && SET ZSTD=./zstd.exe &&
SET DATAGEN=..\projects\datagen.exe && SET DATAGEN=./datagen.exe &&
sh playTests.sh --test-large-data && sh -e playTests.sh --test-large-data &&
CD .. && CD .. &&
projects\fullbench.exe -i1 && projects\fullbench.exe -i1 &&
projects\fullbench.exe -i1 -P0 && projects\fullbench.exe -i1 -P0 &&

View File

@ -30,15 +30,15 @@ case "$OS" in
esac esac
MD5SUM="md5sum" MD5SUM="md5sum"
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
MD5SUM="md5 -r" MD5SUM="md5 -r"
fi fi
$ECHO "\nStarting playTests.sh isWindows=$isWindows" $ECHO "\nStarting playTests.sh isWindows=$isWindows TRAVIS_OS_NAME=$TRAVIS_OS_NAME"
file $ZSTD
[ -n "$ZSTD" ] || die "ZSTD variable must be defined!" [ -n "$ZSTD" ] || die "ZSTD variable must be defined!"
file $ZSTD
$ECHO "\n**** simple tests **** " $ECHO "\n**** simple tests **** "
./datagen > tmp ./datagen > tmp