facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add callsites to zstdcli.c and tests to playTests.sh

Browse Source
This commit is contained in:
senhuang42 2020-10-07 13:47:38 -04:00
parent 93cd9d8a6e
commit 7259b258d1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/zstdcli.c
View File

@ -697,6 +697,7 @@ int main(int const argCount, const char* argv[])
int argNb, int argNb,
followLinks = 0, followLinks = 0,
forceStdout = 0, forceStdout = 0,
hasStdout = 0,
ldmFlag = 0, ldmFlag = 0,
main_pause = 0, main_pause = 0,
nbWorkers = 0, nbWorkers = 0,
@ -1282,9 +1283,12 @@ int main(int const argCount, const char* argv[])
} }
/* No status message in pipe mode (stdin - stdout) */ /* No status message in pipe mode (stdin - stdout) */
if (!strcmp(filenames->fileNames[0], stdinmark) && outFileName && !strcmp(outFileName,stdoutmark) && (g_displayLevel==2)) g_displayLevel=1; hasStdout = outFileName && !strcmp(outFileName,stdoutmark);
if (hasStdout && (g_displayLevel==2)) g_displayLevel=1;
/* IO Stream/File */ /* IO Stream/File */
FIO_setHasStdoutOutput(fCtx, hasStdout);
FIO_setNbFilesTotal(fCtx, (int)filenames->tableSize); FIO_setNbFilesTotal(fCtx, (int)filenames->tableSize);
FIO_determineHasStdinInput(fCtx, filenames); FIO_determineHasStdinInput(fCtx, filenames);
FIO_setNotificationLevel(g_displayLevel); FIO_setNotificationLevel(g_displayLevel);

5
tests/playTests.sh
View File

@ -396,9 +396,8 @@ cp tmp_rm3.zst tmp_rm4.zst
echo 'Y' | zstd -d tmp_rm3.zst tmp_rm4.zst -o tmp_rm_out --rm echo 'Y' | zstd -d tmp_rm3.zst tmp_rm4.zst -o tmp_rm_out --rm
test ! -f tmp_rm3.zst test ! -f tmp_rm3.zst
test ! -f tmp_rm4.zst test ! -f tmp_rm4.zst
echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm > $INTOVOID echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm && die "compressing multiple files to stdout with --rm should fail unless -f is specified"
test ! -f tmp_rm_out echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm -v && die "compressing multiple files to stdout with --rm should fail unless -f is specified"
test ! -f tmp_rm3
println gooder > tmpexists1 println gooder > tmpexists1
zstd tmpexists1 tmpexists -c --rm -f > $INTOVOID zstd tmpexists1 tmpexists -c --rm -f > $INTOVOID