playTests.sh working with Linux, Windows, OS X
This commit is contained in:
inikep
parent
d0c3862479
commit
93fc13ebc8
@ -93,7 +93,7 @@ test_script:
|
||||
CD programs &&
|
||||
SET ZSTD=..\projects\zstd.exe &&
|
||||
SET DATAGEN=..\projects\datagen.exe &&
|
||||
CALL tests\playTests.bat --test-large-data &&
|
||||
sh playTests.sh --test-large-data &&
|
||||
CD .. &&
|
||||
projects\fullbench.exe -i1 &&
|
||||
projects\fullbench.exe -i1 -P0 &&
|
||||
|
||||
@ -204,7 +204,7 @@ endif
|
||||
#------------------------------------------------------------------------
|
||||
ifneq (,$(filter $(HOST_OS),MSYS POSIX))
|
||||
zstd-playTests: datagen
|
||||
ZSTD=$(ZSTD) ./tests/playTests.sh $(ZSTDRTTEST)
|
||||
ZSTD=$(ZSTD) ./playTests.sh $(ZSTDRTTEST)
|
||||
|
||||
test: test-zstd test-fullbench test-fuzzer test-zbuff
|
||||
|
||||
|
||||
14
programs/tests/playTests.sh → programs/playTests.sh
Executable file → Normal file
14
programs/tests/playTests.sh → programs/playTests.sh
Executable file → Normal file
@ -15,8 +15,8 @@ roundTripTest() {
|
||||
|
||||
rm -f tmp1 tmp2
|
||||
$ECHO "roundTripTest: ./datagen $1 $p | $ZSTD -v$c | $ZSTD -d"
|
||||
./datagen $1 $p | md5sum > tmp1
|
||||
./datagen $1 $p | $ZSTD -vq$c | $ZSTD -d | md5sum > tmp2
|
||||
./datagen $1 $p | $MD5SUM > tmp1
|
||||
./datagen $1 $p | $ZSTD -vq$c | $ZSTD -d | $MD5SUM > tmp2
|
||||
diff -q tmp1 tmp2
|
||||
}
|
||||
|
||||
@ -29,7 +29,13 @@ case "$OS" in
|
||||
;;
|
||||
esac
|
||||
|
||||
MD5SUM="md5sum"
|
||||
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||
MD5SUM="md5 -r"
|
||||
fi
|
||||
|
||||
$ECHO "\nStarting playTests.sh isWindows=$isWindows"
|
||||
file $ZSTD
|
||||
|
||||
[ -n "$ZSTD" ] || die "ZSTD variable must be defined!"
|
||||
|
||||
@ -122,8 +128,8 @@ diff tmpSparse2M tmpSparseRegenerated
|
||||
$ECHO "\n**** dictionary tests **** "
|
||||
|
||||
./datagen > tmpDict
|
||||
./datagen -g1M | md5sum > tmp1
|
||||
./datagen -g1M | $ZSTD -D tmpDict | $ZSTD -D tmpDict -dvq | md5sum > tmp2
|
||||
./datagen -g1M | $MD5SUM > tmp1
|
||||
./datagen -g1M | $ZSTD -D tmpDict | $ZSTD -D tmpDict -dvq | $MD5SUM > tmp2
|
||||
diff -q tmp1 tmp2
|
||||
$ZSTD --train *.c *.h -o tmpDict
|
||||
$ZSTD xxhash.c -D tmpDict -of tmp
|
||||
@ -1,157 +0,0 @@
|
||||
@echo off
|
||||
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
|
||||
|
||||
echo. && echo **** simple tests ****
|
||||
%DATAGEN% > tmp
|
||||
%ZSTD% -f tmp && REM trivial compression case, creates tmp.zst
|
||||
%ZSTD% -df tmp.zst && REM trivial decompression case (overwrites tmp)
|
||||
echo test : too large compression level (must fail)
|
||||
%ZSTD% -99 tmp && (echo too large compression level undetected && exit /b 1)
|
||||
echo test : compress to stdout
|
||||
%ZSTD% tmp -c > tmpCompressed
|
||||
%ZSTD% tmp --stdout > tmpCompressed && REM long command format
|
||||
echo test : null-length file roundtrip
|
||||
echo. 2>tmpEmpty | cat tmpEmpty | %ZSTD% - --stdout | %ZSTD% -d --stdout || (echo wrong null-length file roundtrip && exit /b 1)
|
||||
echo test : decompress file with wrong suffix (must fail)
|
||||
%ZSTD% -d tmpCompressed && (echo wrong suffix error not detected! && exit /b 1)
|
||||
%ZSTD% -d tmpCompressed -c > tmpResult && REM decompression using stdout
|
||||
%ZSTD% --decompress tmpCompressed -c > tmpResult
|
||||
%ZSTD% --decompress tmpCompressed --stdout > tmpResult
|
||||
REM %ZSTD% -d < tmp.zst > NUL && REM combine decompression, stdin & stdout
|
||||
REM %ZSTD% -d - < tmp.zst > NUL
|
||||
%ZSTD% -dc < tmp.zst > NUL
|
||||
%ZSTD% -dc - < tmp.zst > NUL
|
||||
%ZSTD% -q tmp && (echo overwrite check failed! && exit /b 1)
|
||||
%ZSTD% -q -f tmp
|
||||
%ZSTD% -q --force tmp
|
||||
%ZSTD% -df tmp && (echo should have refused : wrong extension && exit /b 1)
|
||||
|
||||
echo. && echo **** Pass-Through mode ****
|
||||
echo "Hello world !" | %ZSTD% -df
|
||||
echo "Hello world !" | %ZSTD% -dcf
|
||||
|
||||
|
||||
echo. && echo **** frame concatenation ****
|
||||
|
||||
echo hello > hello.tmp
|
||||
echo world! > world.tmp
|
||||
cat hello.tmp world.tmp > helloworld.tmp
|
||||
%ZSTD% -c hello.tmp > hello.zstd
|
||||
%ZSTD% -c world.tmp > world.zstd
|
||||
cat hello.zstd world.zstd > helloworld.zstd
|
||||
%ZSTD% -dc helloworld.zstd > result.tmp
|
||||
cat result.tmp
|
||||
fc /b helloworld.tmp result.tmp
|
||||
rm *.tmp *.zstd
|
||||
|
||||
echo frame concatenation tests completed
|
||||
|
||||
|
||||
REM echo. && echo **** flush write error test ****
|
||||
|
||||
REM echo echo foo ^| %ZSTD% ^> v:\full
|
||||
REM echo foo | %ZSTD% > v:\full && (echo write error not detected! && exit /b 1)
|
||||
REM echo "echo foo | %ZSTD% | %ZSTD% -d > /dev/full"
|
||||
REM echo foo | %ZSTD% | %ZSTD% -d > /dev/full && (echo write error not detected! && exit /b 1)
|
||||
|
||||
|
||||
echo. && echo **** dictionary tests ****
|
||||
|
||||
%DATAGEN% > tmpDict
|
||||
%DATAGEN% -g1M | md5sum > tmp1
|
||||
%DATAGEN% -g1M | %ZSTD% -D tmpDict | %ZSTD% -D tmpDict -dvq | md5sum > tmp2
|
||||
fc tmp1 tmp2
|
||||
%ZSTD% --train *.c *.h -o tmpDict
|
||||
%ZSTD% xxhash.c -D tmpDict -of tmp
|
||||
%ZSTD% -d tmp -D tmpDict -of result
|
||||
fc xxhash.c result
|
||||
|
||||
|
||||
echo. && echo **** multiple files tests ****
|
||||
|
||||
%DATAGEN% -s1 > tmp1 2> NUL
|
||||
%DATAGEN% -s2 -g100K > tmp2 2> NUL
|
||||
%DATAGEN% -s3 -g1M > tmp3 2> NUL
|
||||
%ZSTD% -f tmp*
|
||||
echo compress tmp* :
|
||||
ls -ls tmp*
|
||||
rm tmp1 tmp2 tmp3
|
||||
echo decompress tmp* :
|
||||
%ZSTD% -df *.zst
|
||||
ls -ls tmp*
|
||||
|
||||
echo compress tmp* into stdout ^> tmpall :
|
||||
%ZSTD% -c tmp1 tmp2 tmp3 > tmpall
|
||||
ls -ls tmp*
|
||||
echo decompress tmpall* into stdout ^> tmpdec :
|
||||
cp tmpall tmpall2
|
||||
%ZSTD% -dc tmpall* > tmpdec
|
||||
ls -ls tmp*
|
||||
echo compress multiple files including a missing one (notHere) :
|
||||
%ZSTD% -f tmp1 notHere tmp2 && (echo missing file not detected! && exit /b 1)
|
||||
|
||||
|
||||
echo. && echo **** integrity tests ****
|
||||
echo test one file (tmp1.zst)
|
||||
%ZSTD% -t tmp1.zst
|
||||
%ZSTD% --test tmp1.zst
|
||||
echo test multiple files (*.zst)
|
||||
%ZSTD% -t *.zst
|
||||
echo test good and bad files (*)
|
||||
%ZSTD% -t * && (echo bad files not detected! && exit /b 1)
|
||||
|
||||
|
||||
echo. && echo **** zstd round-trip tests ****
|
||||
|
||||
CALL %ROUNDTRIPTEST%
|
||||
CALL %ROUNDTRIPTEST% -g15K && REM TableID==3
|
||||
CALL %ROUNDTRIPTEST% -g127K && REM TableID==2
|
||||
CALL %ROUNDTRIPTEST% -g255K && REM TableID==1
|
||||
CALL %ROUNDTRIPTEST% -g513K && REM TableID==0
|
||||
CALL %ROUNDTRIPTEST% -g512K 6 && REM greedy, hash chain
|
||||
CALL %ROUNDTRIPTEST% -g512K 16 && REM btlazy2
|
||||
CALL %ROUNDTRIPTEST% -g512K 19 && REM btopt
|
||||
|
||||
rm tmp*
|
||||
echo Param = %1
|
||||
if NOT "%1"=="--test-large-data" (
|
||||
echo skipping large data tests
|
||||
exit /b 0
|
||||
)
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g270000000 1
|
||||
CALL %ROUNDTRIPTEST% -g270000000 2
|
||||
CALL %ROUNDTRIPTEST% -g270000000 3
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g140000000 -P60 4
|
||||
CALL %ROUNDTRIPTEST% -g140000000 -P60 5
|
||||
CALL %ROUNDTRIPTEST% -g140000000 -P60 6
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g70000000 -P70 7
|
||||
CALL %ROUNDTRIPTEST% -g70000000 -P70 8
|
||||
CALL %ROUNDTRIPTEST% -g70000000 -P70 9
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g35000000 -P75 10
|
||||
CALL %ROUNDTRIPTEST% -g35000000 -P75 11
|
||||
CALL %ROUNDTRIPTEST% -g35000000 -P75 12
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g18000000 -P80 13
|
||||
CALL %ROUNDTRIPTEST% -g18000000 -P80 14
|
||||
CALL %ROUNDTRIPTEST% -g18000000 -P80 15
|
||||
CALL %ROUNDTRIPTEST% -g18000000 -P80 16
|
||||
CALL %ROUNDTRIPTEST% -g18000000 -P80 17
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g50000000 -P94 18
|
||||
CALL %ROUNDTRIPTEST% -g50000000 -P94 19
|
||||
|
||||
CALL %ROUNDTRIPTEST% -g99000000 -P99 20
|
||||
CALL %ROUNDTRIPTEST% -g6000000000 -P99 1
|
||||
|
||||
rm tmp*
|
||||
exit /b 0
|
||||
@ -1,8 +0,0 @@
|
||||
@echo off
|
||||
if [%3]==[] (SET C=%2 && SET P=) ELSE (SET C=%3 && SET P=%2)
|
||||
rm -f tmp1 tmp2
|
||||
echo roundTripTest: datagen %1 %P% ^| %ZSTD% -v%C% ^| %ZSTD% -d
|
||||
%DATAGEN% %1 %P% | md5sum > tmp1
|
||||
%DATAGEN% %1 %P% | %ZSTD% -vq%C% | %ZSTD% -d | md5sum > tmp2
|
||||
fc tmp1 tmp2
|
||||
EXIT /B %ERRORLEVEL%
|
||||
@ -52,7 +52,7 @@
|
||||
# include <io.h> /* _isatty */
|
||||
# define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream))
|
||||
#else
|
||||
#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _POSIX_SOURCE
|
||||
#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE)
|
||||
# include <unistd.h> /* isatty */
|
||||
# define IS_CONSOLE(stdStream) isatty(fileno(stdStream))
|
||||
#else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user