Merge pull request #1222 from bket/openbsd

2 separate issues found when running zstd's tests on OpenBSD
This commit is contained in:
Yann Collet 2018-06-30 11:47:41 -07:00 committed by GitHub
commit 636eaf965e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -48,6 +48,8 @@ fileRoundTripTest() {
$DIFF -q tmp.md5.1 tmp.md5.2 $DIFF -q tmp.md5.1 tmp.md5.2
} }
UNAME=$(uname)
isTerminal=false isTerminal=false
if [ -t 0 ] && [ -t 1 ] if [ -t 0 ] && [ -t 1 ]
then then
@ -56,7 +58,10 @@ fi
isWindows=false isWindows=false
INTOVOID="/dev/null" INTOVOID="/dev/null"
DEVDEVICE="/dev/random" case "$UNAME" in
OpenBSD) DEVDEVICE="/dev/zero" ;;
*) DEVDEVICE="/dev/random" ;;
esac
case "$OS" in case "$OS" in
Windows*) Windows*)
isWindows=true isWindows=true
@ -65,7 +70,6 @@ case "$OS" in
;; ;;
esac esac
UNAME=$(uname)
case "$UNAME" in case "$UNAME" in
Darwin) MD5SUM="md5 -r" ;; Darwin) MD5SUM="md5 -r" ;;
FreeBSD) MD5SUM="gmd5sum" ;; FreeBSD) MD5SUM="gmd5sum" ;;
@ -544,16 +548,16 @@ $ZSTD --format=xz -V || LZMAMODE=0
if [ $LZMAMODE -eq 1 ]; then if [ $LZMAMODE -eq 1 ]; then
$ECHO "xz support detected" $ECHO "xz support detected"
XZEXE=1 XZEXE=1
xz -V && lzma -V || XZEXE=0 xz -Q -V && lzma -Q -V || XZEXE=0
if [ $XZEXE -eq 1 ]; then if [ $XZEXE -eq 1 ]; then
$ECHO "Testing zstd xz and lzma support" $ECHO "Testing zstd xz and lzma support"
./datagen > tmp ./datagen > tmp
$ZSTD --format=lzma -f tmp $ZSTD --format=lzma -f tmp
$ZSTD --format=xz -f tmp $ZSTD --format=xz -f tmp
xz -t -v tmp.xz xz -Q -t -v tmp.xz
xz -t -v tmp.lzma xz -Q -t -v tmp.lzma
xz -f -k tmp xz -Q -f -k tmp
lzma -f -k --lzma1 tmp lzma -Q -f -k --lzma1 tmp
$ZSTD -d -f -v tmp.xz $ZSTD -d -f -v tmp.xz
$ZSTD -d -f -v tmp.lzma $ZSTD -d -f -v tmp.lzma
rm tmp* rm tmp*
@ -565,13 +569,13 @@ if [ $LZMAMODE -eq 1 ]; then
$ECHO "Testing xz and lzma symlinks" $ECHO "Testing xz and lzma symlinks"
./datagen > tmp ./datagen > tmp
./xz tmp ./xz tmp
xz -d tmp.xz xz -Q -d tmp.xz
./lzma tmp ./lzma tmp
lzma -d tmp.lzma lzma -Q -d tmp.lzma
$ECHO "Testing unxz and unlzma symlinks" $ECHO "Testing unxz and unlzma symlinks"
xz tmp xz -Q tmp
./xz -d tmp.xz ./xz -d tmp.xz
lzma tmp lzma -Q tmp
./lzma -d tmp.lzma ./lzma -d tmp.lzma
rm xz unxz lzma unlzma rm xz unxz lzma unlzma
rm tmp* rm tmp*