From 125bcde17cc49e2838da1da64efcc69cc478c379 Mon Sep 17 00:00:00 2001 From: Jon Palmisciano Date: Tue, 20 Dec 2022 20:11:37 -0500 Subject: [PATCH] Update tests to expect new CLI help output --- tests/cli-tests/basic/help.sh.stdout.glob | 41 +++++++++++-------- tests/cli-tests/basic/version.sh.stdout.glob | 4 +- .../progress/no-progress.sh.stderr.glob | 20 ++++----- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/tests/cli-tests/basic/help.sh.stdout.glob b/tests/cli-tests/basic/help.sh.stdout.glob index bfb0f7753..5580dc669 100644 --- a/tests/cli-tests/basic/help.sh.stdout.glob +++ b/tests/cli-tests/basic/help.sh.stdout.glob @@ -1,25 +1,34 @@ + zstd -h -Usage: zstd *OPTION*... *FILE*... *-o file* -Compress or uncompress FILEs (with no FILE or when FILE is `-`, read from standard input). +Compress or decompress the INPUT file(s); reads from STDIN if INPUT is `-` or not provided. - -o file result stored into `file` (only 1 output file) - -1 .. -19 compression level (faster .. better; default: 3) - -d, --decompress decompression - -f, --force disable input and output checks. Allows overwriting existing files, - input from console, output to stdout, operating on links, - block devices, etc. During decompression and when the output - destination is stdout, pass-through unrecognized formats as-is. - --rm remove source file(s) after successful de/compression - -k, --keep preserve source file(s) (default) - -D DICT use DICT as Dictionary for compression or decompression - -h display usage and exit - -H,--help display long help and exit +Usage: zstd *OPTIONS...* *INPUT... | -* *-o OUTPUT* + +Options: + -o OUTPUT Write output to a single file, OUTPUT. + -k, --keep Preserve INPUT file(s). *Default* + --rm Remove INPUT file(s) after successful (de)compression. + + -# Desired compression level, where `#` is a number between 1 and 19; + lower numbers provide faster compression, higher numbers yield + better compression ratios. *Default: 3* + + -d, --decompress Perform decompression. + -D DICT Use DICT as the dictionary for compression or decompression. + + -f, --force Disable input and output checks. Allows overwriting existing files, + receiving input from the console, printing ouput to STDOUT, and + operating on links, block devices, etc. Unrecognized formats will be + passed-through through as-is. + + -h Display short usage and exit. + -H, --help Display full help and exit. + -V, --version Display the program version and exit. + zstd -H ... -Advanced options : +Advanced options: ... + zstd --help ... -Advanced options : +Advanced options: ... diff --git a/tests/cli-tests/basic/version.sh.stdout.glob b/tests/cli-tests/basic/version.sh.stdout.glob index 54968fa41..4cc9fb9b2 100644 --- a/tests/cli-tests/basic/version.sh.stdout.glob +++ b/tests/cli-tests/basic/version.sh.stdout.glob @@ -1,2 +1,2 @@ -*** zstd command line interface *-bits v1.*.*, by Yann Collet *** -*** zstd command line interface *-bits v1.*.*, by Yann Collet *** +*** Zstandard CLI (*-bit) v1.*.*, by Yann Collet *** +*** Zstandard CLI (*-bit) v1.*.*, by Yann Collet *** diff --git a/tests/cli-tests/progress/no-progress.sh.stderr.glob b/tests/cli-tests/progress/no-progress.sh.stderr.glob index f07ad3803..b4262517a 100644 --- a/tests/cli-tests/progress/no-progress.sh.stderr.glob +++ b/tests/cli-tests/progress/no-progress.sh.stderr.glob @@ -55,36 +55,36 @@ decompress 2 files args = --no-progress --fake-stderr-is-console -v compress file to file -*zstd* +*Zstandard CLI* hello*hello.zst* compress pipe to pipe -*zstd* +*Zstandard CLI* *stdin*stdout* compress pipe to file -*zstd* +*Zstandard CLI* *stdin*hello.zst* compress file to pipe -*zstd* +*Zstandard CLI* *hello*stdout* compress 2 files -*zstd* +*Zstandard CLI* *hello*hello.zst* *world*world.zst* 2 files compressed* decompress file to file -*zstd* +*Zstandard CLI* hello.zst* decompress pipe to pipe -*zstd* +*Zstandard CLI* *stdin* decompress pipe to file -*zstd* +*Zstandard CLI* *stdin* decompress file to pipe -*zstd* +*Zstandard CLI* hello.zst* decompress 2 files -*zstd* +*Zstandard CLI* hello.zst* world.zst* 2 files decompressed* -- 2.47.2