Merge branch 'dev' into shorterTests

fixed conflicts
This commit is contained in:
Yann Collet
2017-09-28 12:19:28 -07:00
25 changed files with 933 additions and 420 deletions
+5 -1
View File
@@ -55,7 +55,6 @@ then
fi
isWindows=false
ECHO="echo -e"
INTOVOID="/dev/null"
case "$OS" in
Windows*)
@@ -76,6 +75,11 @@ case "$UNAME" in
SunOS) DIFF="gdiff" ;;
esac
ECHO="echo -e"
case "$UNAME" in
Darwin) ECHO="echo" ;;
esac
$ECHO "\nStarting playTests.sh isWindows=$isWindows ZSTD='$ZSTD'"
[ -n "$ZSTD" ] || die "ZSTD variable must be defined!"