From: Yann Collet <cyan@fb.com>
Date: Tue, 26 Nov 2019 22:33:04 +0000 (-0800)
Subject: Merge branch 'dev' into ahmed_file
X-Git-Tag: v1.4.5^2~141^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46bdbb9c0680fe9bf648bebdc493315c3634644e;p=thirdparty%2Fzstd.git

Merge branch 'dev' into ahmed_file
---

46bdbb9c0680fe9bf648bebdc493315c3634644e
diff --cc tests/playTests.sh
index d306a41c2,df9568eb5..84cb2d52d
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@@ -1271,5 -1205,18 +1287,4 @@@ $ZSTD --train-cover "$TESTDIR"/*.c "$PR
  test -f dictionary
  rm -f tmp* dictionary
  
 -if [ "$isWindows" = false ] ; then
 -
 -println "\n===>  zstd fifo named pipe test "
 -dd bs=1 count=10 if=/dev/zero of=tmp_original
 -mkfifo named_pipe
 -dd bs=1 count=10 if=/dev/zero of=named_pipe &
 -$ZSTD named_pipe -o tmp_compressed
 -$ZSTD -d -o tmp_decompressed tmp_compressed
 -$DIFF -s tmp_original tmp_decompressed
 -rm -rf tmp*
 -rm -rf named_pipe
 -
 -fi
--
  rm -f tmp*