From: Nick Terrell Date: Tue, 18 Jul 2017 21:45:49 +0000 (-0700) Subject: [zstdcli] Fix -t in streaming mode X-Git-Tag: v1.3.1^2~23^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F770%2Fhead;p=thirdparty%2Fzstd.git [zstdcli] Fix -t in streaming mode --- diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 35772e0a7..b1268c1f3 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -719,6 +719,10 @@ int main(int argCount, const char* argv[]) goto _end; } +#ifndef ZSTD_NODECOMPRESS + if (operation==zom_test) { outFileName=nulmark; FIO_setRemoveSrcFile(0); } /* test mode */ +#endif + /* No input filename ==> use stdin and stdout */ filenameIdx += !filenameIdx; /* filenameTable[0] is stdin by default */ if (!strcmp(filenameTable[0], stdinmark) && !outFileName) outFileName = stdoutmark; /* when input is stdin, default output is stdout */ @@ -763,7 +767,6 @@ int main(int argCount, const char* argv[]) #endif } else { /* decompression or test */ #ifndef ZSTD_NODECOMPRESS - if (operation==zom_test) { outFileName=nulmark; FIO_setRemoveSrcFile(0); } /* test mode */ FIO_setMemLimit(memLimit); if (filenameIdx==1 && outFileName) operationResult = FIO_decompressFilename(outFileName, filenameTable[0], dictFileName); diff --git a/tests/playTests.sh b/tests/playTests.sh index dd0f2dbfe..77853b1a4 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -383,6 +383,7 @@ $ZSTD -t --rm tmp1.zst test -f tmp1.zst # check file is still present split -b16384 tmp1.zst tmpSplit. $ZSTD -t tmpSplit.* && die "bad file not detected !" +./datagen | $ZSTD -c | $ZSTD -t $ECHO "\n**** benchmark mode tests **** "