change logic when stderr is not console : don't update progress status

but keep warnings and final operation statement.

updated tests/cli-tests/ accordingly

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index ce2b96a8c3250138d8903c98aeb66ef178944134..39f8b34fe2cf629cb674ead8f07195cb6e1a7197 100644 (file)
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -1500,9 +1500,8 @@ int main(int argCount, const char* argv[])
     hasStdout = outFileName && !strcmp(outFileName,stdoutmark);
     if (hasStdout && (g_displayLevel==2)) g_displayLevel=1;
 
-    /* when stderr is not the console, do not pollute it with status updates
-     * Note : the below code actually also silence more stuff, including completion report. */
-    if (!UTIL_isConsole(stderr) && (g_displayLevel==2)) g_displayLevel=1;
+    /* when stderr is not the console, do not pollute it with progress updates (unless requested) */
+    if (!UTIL_isConsole(stderr) && (progress!=FIO_ps_always)) progress=FIO_ps_never;
     FIO_setProgressSetting(progress);
 
     /* don't remove source files when output is stdout */;

diff --git a/tests/cli-tests/basic/memlimit.sh b/tests/cli-tests/basic/memlimit.sh
index 61a5fc084cc33a2a1c98c5ab15a6481c88d96784..88d734d0d9d55599e89ab5a1620fe47c80f1afd8 100755 (executable)
--- a/tests/cli-tests/basic/memlimit.sh
+++ b/tests/cli-tests/basic/memlimit.sh
@@ -15,25 +15,25 @@ zstd --memory=32asbdf file && die "Should not allow bogus suffix"
 println "+ zstd --memory=hello file"
 zstd --memory=hello file && die "Should not allow non-numeric parameter"
 println "+ zstd --memory=1 file"
-zstd --memory=1 file && die "Should allow numeric parameter without suffix"
+zstd -q --memory=1 file && die "Should allow numeric parameter without suffix"
 rm file.zst
 println "+ zstd --memory=1K file"
-zstd --memory=1K file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1K file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 println "+ zstd --memory=1KB file"
-zstd --memory=1KB file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1KB file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 println "+ zstd --memory=1KiB file"
-zstd --memory=1KiB file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1KiB file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 println "+ zstd --memory=1M file"
-zstd --memory=1M file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1M file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 println "+ zstd --memory=1MB file"
-zstd --memory=1MB file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1MB file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 println "+ zstd --memory=1MiB file"
-zstd --memory=1MiB file && die "Should allow numeric parameter with expected suffix"
+zstd -q --memory=1MiB file && die "Should allow numeric parameter with expected suffix"
 rm file.zst
 
 rm file

diff --git a/tests/cli-tests/compression/levels.sh b/tests/cli-tests/compression/levels.sh
index 47ac2029f7a553401ec026efffd3c781aa6e2b7c..cc2700a3097a9ebcc0ae13842d79dfc9f13660fa 100755 (executable)
--- a/tests/cli-tests/compression/levels.sh
+++ b/tests/cli-tests/compression/levels.sh
@@ -6,10 +6,10 @@ set -v
 datagen > file
 
 # Compress with various levels and ensure that their sizes are ordered
-zstd --fast=10 file -o file-f10.zst
-zstd --fast=1 file -o file-f1.zst
-zstd -1 file -o file-1.zst
-zstd -19 file -o file-19.zst
+zstd --fast=10 file -o file-f10.zst -q
+zstd --fast=1 file -o file-f1.zst -q
+zstd -1 file -o file-1.zst -q
+zstd -19 file -o file-19.zst -q
 
 zstd -t file-f10.zst file-f1.zst file-1.zst file-19.zst
 
@@ -18,15 +18,15 @@ cmp_size -lt file-1.zst file-f1.zst
 cmp_size -lt file-f1.zst file-f10.zst
 
 # Test default levels
-zstd --fast file -f
+zstd --fast file -f -q
 cmp file.zst file-f1.zst || die "--fast is not level -1"
 
-zstd -0 file -o file-0.zst
-zstd -f file
+zstd -0 file -o file-0.zst -q
+zstd -f file -q
 cmp file.zst file-0.zst || die "Level 0 is not the default level"
 
 # Test level clamping
-zstd -99 file -o file-99.zst
+zstd -99 file -o file-99.zst -q
 cmp file-19.zst file-99.zst || die "Level 99 is clamped to 19"
 zstd --fast=200000 file -c | zstd -t
 
@@ -34,10 +34,10 @@ zstd -5000000000 -f file       && die "Level too large, must fail" ||:
 zstd --fast=5000000000 -f file && die "Level too large, must fail" ||:
 
 # Test setting a level through the environment variable
-ZSTD_CLEVEL=-10 zstd file -o file-f10-env.zst
-ZSTD_CLEVEL=1 zstd file -o file-1-env.zst
-ZSTD_CLEVEL=+19 zstd file -o file-19-env.zst
-ZSTD_CLEVEL=+99 zstd file -o file-99-env.zst
+ZSTD_CLEVEL=-10 zstd file -o file-f10-env.zst -q
+ZSTD_CLEVEL=1 zstd file -o file-1-env.zst -q
+ZSTD_CLEVEL=+19 zstd file -o file-19-env.zst -q
+ZSTD_CLEVEL=+99 zstd file -o file-99-env.zst -q
 
 cmp file-f10.zst file-f10-env.zst || die "Environment variable failed to set level"
 cmp file-1.zst file-1-env.zst || die "Environment variable failed to set level"
@@ -45,18 +45,18 @@ cmp file-19.zst file-19-env.zst || die "Environment variable failed to set level
 cmp file-99.zst file-99-env.zst || die "Environment variable failed to set level"
 
 # Test invalid environment clevel is the default level
-zstd -f file
-ZSTD_CLEVEL=- zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=+ zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=a zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=-a zstd -f file -o file-env.zst        ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=+a zstd -f file -o file-env.zst        ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=3a7 zstd -f file -o file-env.zst       ; cmp file.zst file-env.zst
-ZSTD_CLEVEL=5000000000 zstd -f file -o file-env.zst; cmp file.zst file-env.zst
+zstd -f file -q
+ZSTD_CLEVEL=- zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=+ zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=a zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=-a zstd -f file -o file-env.zst -q     ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=+a zstd -f file -o file-env.zst -q     ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=3a7 zstd -f file -o file-env.zst -q    ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=5000000000 zstd -f file -o file-env.zst -q ; cmp file.zst file-env.zst
 
 # Test environment clevel is overridden by command line
-ZSTD_CLEVEL=10 zstd -f file -1 -o file-1-env.zst
-ZSTD_CLEVEL=10 zstd -f file --fast=1 -o file-f1-env.zst
+ZSTD_CLEVEL=10 zstd -f file -1 -o file-1-env.zst -q
+ZSTD_CLEVEL=10 zstd -f file --fast=1 -o file-f1-env.zst -q
 
 cmp file-1.zst file-1-env.zst  || die "Environment variable not overridden"
 cmp file-f1.zst file-f1-env.zst || die "Environment variable not overridden"

diff --git a/tests/cli-tests/compression/levels.sh.stderr.exact b/tests/cli-tests/compression/levels.sh.stderr.exact
index 5664f854b19bb5179eb9238598c2867b4d7fc18b..c8fb79c6896b4d9ff5b61c45cf52ab231e4c9911 100644 (file)
--- a/tests/cli-tests/compression/levels.sh.stderr.exact
+++ b/tests/cli-tests/compression/levels.sh.stderr.exact
@@ -2,30 +2,31 @@
 datagen > file
 
 # Compress with various levels and ensure that their sizes are ordered
-zstd --fast=10 file -o file-f10.zst
-zstd --fast=1 file -o file-f1.zst
-zstd -1 file -o file-1.zst
-zstd -19 file -o file-19.zst
+zstd --fast=10 file -o file-f10.zst -q
+zstd --fast=1 file -o file-f1.zst -q
+zstd -1 file -o file-1.zst -q
+zstd -19 file -o file-19.zst -q
 
 zstd -t file-f10.zst file-f1.zst file-1.zst file-19.zst
+4 files decompressed : 262148 bytes total 
 
 cmp_size -lt file-19.zst file-1.zst
 cmp_size -lt file-1.zst file-f1.zst
 cmp_size -lt file-f1.zst file-f10.zst
 
 # Test default levels
-zstd --fast file -f
+zstd --fast file -f -q
 cmp file.zst file-f1.zst || die "--fast is not level -1"
 
-zstd -0 file -o file-0.zst
-zstd -f file
+zstd -0 file -o file-0.zst -q
+zstd -f file -q
 cmp file.zst file-0.zst || die "Level 0 is not the default level"
 
 # Test level clamping
-zstd -99 file -o file-99.zst
-Warning : compression level higher than max, reduced to 19 
+zstd -99 file -o file-99.zst -q
 cmp file-19.zst file-99.zst || die "Level 99 is clamped to 19"
 zstd --fast=200000 file -c | zstd -t
+/*stdin*\           : 65537 bytes 
 
 zstd -5000000000 -f file       && die "Level too large, must fail" ||:
 error: numeric value overflows 32-bit unsigned int 
@@ -33,11 +34,10 @@ zstd --fast=5000000000 -f file && die "Level too large, must fail" ||:
 error: numeric value overflows 32-bit unsigned int 
 
 # Test setting a level through the environment variable
-ZSTD_CLEVEL=-10 zstd file -o file-f10-env.zst
-ZSTD_CLEVEL=1 zstd file -o file-1-env.zst
-ZSTD_CLEVEL=+19 zstd file -o file-19-env.zst
-ZSTD_CLEVEL=+99 zstd file -o file-99-env.zst
-Warning : compression level higher than max, reduced to 19 
+ZSTD_CLEVEL=-10 zstd file -o file-f10-env.zst -q
+ZSTD_CLEVEL=1 zstd file -o file-1-env.zst -q
+ZSTD_CLEVEL=+19 zstd file -o file-19-env.zst -q
+ZSTD_CLEVEL=+99 zstd file -o file-99-env.zst -q
 
 cmp file-f10.zst file-f10-env.zst || die "Environment variable failed to set level"
 cmp file-1.zst file-1-env.zst || die "Environment variable failed to set level"
@@ -45,25 +45,25 @@ cmp file-19.zst file-19-env.zst || die "Environment variable failed to set level
 cmp file-99.zst file-99-env.zst || die "Environment variable failed to set level"
 
 # Test invalid environment clevel is the default level
-zstd -f file
-ZSTD_CLEVEL=- zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
+zstd -f file -q
+ZSTD_CLEVEL=- zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=-: not a valid integer value 
-ZSTD_CLEVEL=+ zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=+ zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=+: not a valid integer value 
-ZSTD_CLEVEL=a zstd -f file -o file-env.zst         ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=a zstd -f file -o file-env.zst -q      ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=a: not a valid integer value 
-ZSTD_CLEVEL=-a zstd -f file -o file-env.zst        ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=-a zstd -f file -o file-env.zst -q     ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=-a: not a valid integer value 
-ZSTD_CLEVEL=+a zstd -f file -o file-env.zst        ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=+a zstd -f file -o file-env.zst -q     ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=+a: not a valid integer value 
-ZSTD_CLEVEL=3a7 zstd -f file -o file-env.zst       ; cmp file.zst file-env.zst
+ZSTD_CLEVEL=3a7 zstd -f file -o file-env.zst -q    ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=3a7: not a valid integer value 
-ZSTD_CLEVEL=5000000000 zstd -f file -o file-env.zst; cmp file.zst file-env.zst
+ZSTD_CLEVEL=5000000000 zstd -f file -o file-env.zst -q ; cmp file.zst file-env.zst
 Ignore environment variable setting ZSTD_CLEVEL=5000000000: numeric value too large 
 
 # Test environment clevel is overridden by command line
-ZSTD_CLEVEL=10 zstd -f file -1 -o file-1-env.zst
-ZSTD_CLEVEL=10 zstd -f file --fast=1 -o file-f1-env.zst
+ZSTD_CLEVEL=10 zstd -f file -1 -o file-1-env.zst -q
+ZSTD_CLEVEL=10 zstd -f file --fast=1 -o file-f1-env.zst -q
 
 cmp file-1.zst file-1-env.zst  || die "Environment variable not overridden"
 cmp file-f1.zst file-f1-env.zst || die "Environment variable not overridden"

diff --git a/tests/cli-tests/compression/multi-threaded.sh b/tests/cli-tests/compression/multi-threaded.sh
index bd01448e2e84c26263272e9c7979ba95bedf7a35..17a5eb5186b3ecff7a780b5f486397b121b48a89 100755 (executable)
--- a/tests/cli-tests/compression/multi-threaded.sh
+++ b/tests/cli-tests/compression/multi-threaded.sh
@@ -3,13 +3,13 @@
 set -e
 
 # Test multi-threaded flags
-zstd --single-thread file -f            ; zstd -t file.zst
-zstd -T2 -f file                        ; zstd -t file.zst
-zstd --rsyncable -f file                ; zstd -t file.zst
-zstd -T0 -f file                        ; zstd -t file.zst
-zstd -T0 --auto-threads=logical -f file ; zstd -t file.zst
-zstd -T0 --auto-threads=physical -f file; zstd -t file.zst
+zstd --single-thread file -f -q         ; zstd -t file.zst
+zstd -T2 -f file -q                     ; zstd -t file.zst
+zstd --rsyncable -f file -q             ; zstd -t file.zst
+zstd -T0 -f file -q                     ; zstd -t file.zst
+zstd -T0 --auto-threads=logical -f file -q ; zstd -t file.zst
+zstd -T0 --auto-threads=physical -f file -q ; zstd -t file.zst
 
 # multi-thread decompression warning test
-zstd -T0 -f file                        ; zstd -t file.zst; zstd -T0 -d file.zst -o file3
-zstd -T0 -f file                        ; zstd -t file.zst; zstd -T2 -d file.zst -o file4
+zstd -T0 -f file -q                     ; zstd -t file.zst; zstd -T0 -d file.zst -o file3
+zstd -T0 -f file -q                     ; zstd -t file.zst; zstd -T2 -d file.zst -o file4

diff --git a/tests/cli-tests/compression/multi-threaded.sh.stderr.exact b/tests/cli-tests/compression/multi-threaded.sh.stderr.exact
index 54d47d8bd70085c9f0441d8dcd80f4b153474dac..11daff6ba63b0239e9866b856870404020b4c3d0 100644 (file)
--- a/tests/cli-tests/compression/multi-threaded.sh.stderr.exact
+++ b/tests/cli-tests/compression/multi-threaded.sh.stderr.exact
@@ -1 +1,11 @@
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
+file.zst            : 65537 bytes 
 Warning : decompression does not support multi-threading
+file.zst            : 65537 bytes 

diff --git a/tests/cli-tests/decompression/pass-through.sh.stderr.exact b/tests/cli-tests/decompression/pass-through.sh.stderr.exact
index f9ac13cb2750d9e2abe7fcb313fc112c6ab78dc8..62f96ae420eeef4f2abc56f18be33dbcb393dcdb 100644 (file)
--- a/tests/cli-tests/decompression/pass-through.sh.stderr.exact
+++ b/tests/cli-tests/decompression/pass-through.sh.stderr.exact
@@ -1,3 +1,4 @@
+file                 :230.00%   (    10 B =>     23 B, file.zst) 
 zstd: file: unsupported format 
 zstd: file: unsupported format 
 zstd: file: unsupported format 

diff --git a/tests/cli-tests/dictionaries/dictionary-mismatch.sh b/tests/cli-tests/dictionaries/dictionary-mismatch.sh
index 8264ccca5a2f06cb7bb5d0e826e3c944b5547c66..885cac223adf51dd9f7ad32ac25da534b87f1cd4 100755 (executable)
--- a/tests/cli-tests/dictionaries/dictionary-mismatch.sh
+++ b/tests/cli-tests/dictionaries/dictionary-mismatch.sh
@@ -23,7 +23,7 @@ if [ false ]; then
 fi
 
 set -v
-zstd files/0 -D dicts/0
+zstd files/0 -D dicts/0 -q
 zstd -t files/0.zst -D dicts/0
 zstd -t files/0.zst -D dicts/1 && die "Must fail" ||:
 zstd -t files/0.zst            && die "Must fail" ||:

diff --git a/tests/cli-tests/dictionaries/dictionary-mismatch.sh.stderr.exact b/tests/cli-tests/dictionaries/dictionary-mismatch.sh.stderr.exact
index 0afea722e984dd64296de1aecb208d8c9c2d3cf1..8896763c1bcb38462884ca7ad84f9d21db9be402 100644 (file)
--- a/tests/cli-tests/dictionaries/dictionary-mismatch.sh.stderr.exact
+++ b/tests/cli-tests/dictionaries/dictionary-mismatch.sh.stderr.exact
@@ -1,5 +1,6 @@
-zstd files/0 -D dicts/0
+zstd files/0 -D dicts/0 -q
 zstd -t files/0.zst -D dicts/0
+files/0.zst         : 1000 bytes 
 zstd -t files/0.zst -D dicts/1 && die "Must fail" ||:
 files/0.zst : Decoding error (36) : Dictionary mismatch 
 zstd -t files/0.zst            && die "Must fail" ||:

diff --git a/tests/cli-tests/progress/no-progress.sh.stderr.glob b/tests/cli-tests/progress/no-progress.sh.stderr.glob
index b4262517af12ec8cfafeb50c4a9b6c60e8c37208..d0f91122769f5c126a19888ff80cd64a1da15ec7 100644 (file)
--- a/tests/cli-tests/progress/no-progress.sh.stderr.glob
+++ b/tests/cli-tests/progress/no-progress.sh.stderr.glob
@@ -1,15 +1,21 @@
 Tests cases where progress information should not be printed
 args =
 compress file to file
+hello*hello.zst*
 compress pipe to pipe
 compress pipe to file
+*stdin*hello.zst*
 compress file to pipe
 compress 2 files
+2 files compressed*
 decompress file to file
+hello.zst*
 decompress pipe to pipe
 decompress pipe to file
+*stdin*
 decompress file to pipe
 decompress 2 files
+2 files decompressed*
 
 args = --fake-stderr-is-console -q
 compress file to file