From 0298df50f956ab889daf8e5c7e1db8765db1ab11 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 4 Mar 2025 14:43:06 -0800 Subject: [PATCH] update cli-tests --- programs/dibio.c | 6 +++--- programs/zstdcli.c | 4 ++-- tests/cli-tests/dict-builder/no-inputs.sh.stderr.exact | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/dibio.c b/programs/dibio.c index 7ba22d15b..63c455a22 100644 --- a/programs/dibio.c +++ b/programs/dibio.c @@ -362,9 +362,9 @@ int DiB_trainFromFiles(const char* dictFileName, size_t maxDictSize, DISPLAYLEVEL(2, "! As a consequence, only the first %u bytes of each sample are loaded \n", SAMPLESIZE_MAX); } if (fs.nbSamples < 5) { - DISPLAYLEVEL(2, "! Warning : nb of samples too low for proper processing ! \n"); - DISPLAYLEVEL(2, "! Please provide _one file per sample_. \n"); - DISPLAYLEVEL(2, "! Alternatively, split files into fixed-size blocks representative of samples, with -B# \n"); + DISPLAYLEVEL(2, "! Warning : nb of samples too low for proper processing !\n"); + DISPLAYLEVEL(2, "! Please provide _one file per sample_.\n"); + DISPLAYLEVEL(2, "! Alternatively, split file(s) into fixed-size samples, with --split=#\n"); EXM_THROW(14, "nb of samples too low"); /* we now clearly forbid this case */ } if (fs.totalSizeToLoad < (S64)maxDictSize * 8) { diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 4b7f496d0..8d3ebcefa 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -235,8 +235,8 @@ static void usageAdvanced(const char* programName) DISPLAYOUT(" --single-thread Share a single thread for I/O and compression (slightly different than `-T1`).\n"); DISPLAYOUT(" --auto-threads={physical|logical}\n"); DISPLAYOUT(" Use physical/logical cores when using `-T0`. [Default: Physical]\n\n"); - DISPLAYOUT(" -B# Set job size to #. [Default: 0 (automatic)]\n"); - DISPLAYOUT(" --rsyncable Compress using a rsync-friendly method (`-B` sets block size). \n"); + DISPLAYOUT(" --jobsize=# Set job size to #. [Default: 0 (automatic)]\n"); + DISPLAYOUT(" --rsyncable Compress using a rsync-friendly method (`--jobsize=#` sets unit size). \n"); DISPLAYOUT("\n"); # endif DISPLAYOUT(" --exclude-compressed Only compress files that are not already compressed.\n\n"); diff --git a/tests/cli-tests/dict-builder/no-inputs.sh.stderr.exact b/tests/cli-tests/dict-builder/no-inputs.sh.stderr.exact index d7b3ea020..61f217c34 100644 --- a/tests/cli-tests/dict-builder/no-inputs.sh.stderr.exact +++ b/tests/cli-tests/dict-builder/no-inputs.sh.stderr.exact @@ -1,5 +1,5 @@ zstd --train -! Warning : nb of samples too low for proper processing ! -! Please provide _one file per sample_. -! Alternatively, split files into fixed-size blocks representative of samples, with -B# +! Warning : nb of samples too low for proper processing ! +! Please provide _one file per sample_. +! Alternatively, split file(s) into fixed-size samples, with --split=# Error 14 : nb of samples too low