From 4bf9ebca2bb8f1d62395c4b17449cb151e003f92 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 17 Feb 2021 11:15:45 +0100 Subject: [PATCH] tests: update hardlink tests The important is result, not summary or verbose output. Signed-off-by: Karel Zak --- tests/expected/hardlink/options-dryrun | 6 ------ tests/expected/hardlink/options-nargs | 6 ------ tests/ts/hardlink/options | 10 +++++----- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/expected/hardlink/options-dryrun b/tests/expected/hardlink/options-dryrun index f6ffc83327..6b578233a1 100644 --- a/tests/expected/hardlink/options-dryrun +++ b/tests/expected/hardlink/options-dryrun @@ -1,9 +1,3 @@ -Directories: 7 -Objects: 33 -Regular files: 26 -Comparisons: 18 -Would link: 18 -Would save: 147456 dir-1/sdir-1/file-a-1 1 8192 1540236330 644 dir-1/sdir-1/file-a-2 1 8192 1540236330 644 dir-1/sdir-1/file-a-3 1 8192 1540236423 644 diff --git a/tests/expected/hardlink/options-nargs b/tests/expected/hardlink/options-nargs index 96e0296fb1..49f27bf044 100644 --- a/tests/expected/hardlink/options-nargs +++ b/tests/expected/hardlink/options-nargs @@ -1,9 +1,3 @@ -Directories: 1 -Objects: 16 -Regular files: 15 -Comparisons: 9 -Linked: 9 -Saved: 73728 dir-1/sdir-1/file-a-1 4 8192 1540236330 644 dir-1/sdir-1/file-a-2 4 8192 1540236330 644 dir-1/sdir-1/file-a-3 1 8192 1540236423 644 diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options index bb445caf45..e293921a1f 100755 --- a/tests/ts/hardlink/options +++ b/tests/ts/hardlink/options @@ -46,30 +46,30 @@ show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "dryrun" -$TS_CMD_HARDLINK -n -v "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HARDLINK --quiet --dry-run "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "nargs" -$TS_CMD_HARDLINK -v "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HARDLINK --quiet "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >> $TS_OUTPUT 2>> $TS_ERRLOG show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest # cases without and with -x support -tmp=$($TS_CMD_HARDLINK -x pattern "$SRCDIR"/dir-1/sdir-2 2>&1) +tmp=$($TS_CMD_HARDLINK --quiet --exclude pattern "$SRCDIR"/dir-1/sdir-2 2>&1) if test $? -ne 0; then ts_init_subtest "noregex" printf "%s\n" "$tmp" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest else ts_init_subtest "regex-escapes" - $TS_CMD_HARDLINK -x '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG + $TS_CMD_HARDLINK --quiet --exclude '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest fi ts_init_subtest "content" -$TS_CMD_HARDLINK -c "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HARDLINK --quiet --content "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG # When using -c we need to cheat with sed because it's not deterministic which # file (i.e. which timestamp and perms) wins. TODO at least the choice of the # permissions should be sensitive by default and/or controllable by the user. -- 2.47.3