From: Karel Zak Date: Mon, 1 Nov 2021 11:49:16 +0000 (+0100) Subject: tests: update hardlink --maximum-size X-Git-Tag: v2.38-rc1~196^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25a125ee89d0da9e4b815b1ca27b001c7d07ce8a;p=thirdparty%2Futil-linux.git tests: update hardlink --maximum-size Signed-off-by: Karel Zak --- diff --git a/tests/expected/hardlink/options-maximum-size-8191 b/tests/expected/hardlink/options-maximum-size-8191 index cc718d4513..4479c33f8b 100644 --- a/tests/expected/hardlink/options-maximum-size-8191 +++ b/tests/expected/hardlink/options-maximum-size-8191 @@ -1,59 +1,34 @@ -Skipped [Redacted]/hardlink/testdir1/file-a-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-c-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-a-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-c-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-b-1 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-c-1 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-b-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-c-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-b-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-a-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-1/file-a-1 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-b-4 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-b-1 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-a-5 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-a-4 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-2/sdir-2/file-a-5 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-2/sdir-2/file-b-5 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/dir-2/sdir-3/file-b-4 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-c-1 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-b-5 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-b-2 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-c-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-b-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-a-3 (greater than configured size) -Skipped [Redacted]/hardlink/testdir1/file-a-1 (greater than configured size) Mode: real +Method: sha256 Files: 26 Linked: 0 files Compared: 0 xattrs Compared: 0 files Saved: 0 B Duration: [Redacted] -dir-1/sdir-1/file-a-1 10 8192 1540236423 644 -dir-1/sdir-1/file-a-2 10 8192 1540236423 644 -dir-1/sdir-1/file-a-3 10 8192 1540236423 644 -dir-1/sdir-1/file-b-1 10 8192 1540236430 644 -dir-1/sdir-1/file-b-2 10 8192 1540236430 644 -dir-1/sdir-1/file-b-3 10 8192 1540236430 644 -dir-1/sdir-1/file-c-1 6 8192 1540236548 644 -dir-1/sdir-1/file-c-2 6 8192 1540236548 644 -dir-1/sdir-1/file-c-3 6 8192 1540236548 644 -dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 10 8192 1540236423 644 -dir-2/sdir-2/file-a-5 10 8192 1540236423 644 -dir-2/sdir-2/file-b-5 10 8192 1540236430 644 -dir-2/sdir-3/file-b-4 10 8192 1540236430 644 -file-a-1 10 8192 1540236423 644 -file-a-2 10 8192 1540236423 644 -file-a-3 10 8192 1540236423 644 -file-a-4 10 8192 1540236423 644 -file-a-5 10 8192 1540236423 644 -file-b-1 10 8192 1540236430 644 -file-b-2 10 8192 1540236430 644 -file-b-3 10 8192 1540236430 644 -file-b-4 10 8192 1540236430 644 -file-b-5 10 8192 1540236430 644 -file-c-1 6 8192 1540236548 644 -file-c-2 6 8192 1540236548 644 -file-c-3 6 8192 1540236548 644 +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 +dir-1/sdir-1/file-b-1 1 8192 1540236383 644 +dir-1/sdir-1/file-b-2 1 8192 1540236383 644 +dir-1/sdir-1/file-b-3 1 8192 1540236430 644 +dir-1/sdir-1/file-c-1 1 8192 1540236330 644 +dir-1/sdir-1/file-c-2 1 8192 1540236330 644 +dir-1/sdir-1/file-c-3 1 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 1 8192 1540236330 644 +dir-2/sdir-2/file-a-5 1 8192 1540236330 600 +dir-2/sdir-2/file-b-5 1 8192 1540236383 640 +dir-2/sdir-3/file-b-4 1 8192 1540236383 640 +file-a-1 1 8192 1540236330 644 +file-a-2 1 8192 1540236330 644 +file-a-3 1 8192 1540236423 644 +file-a-4 1 8192 1540236330 600 +file-a-5 1 8192 1540236330 600 +file-b-1 1 8192 1540236383 644 +file-b-2 1 8192 1540236383 644 +file-b-3 1 8192 1540236430 644 +file-b-4 1 8192 1540236383 640 +file-b-5 1 8192 1540236383 640 +file-c-1 1 8192 1540236330 644 +file-c-2 1 8192 1540236330 644 +file-c-3 1 8192 1540236548 644 diff --git a/tests/expected/hardlink/options-maximum-size-8192 b/tests/expected/hardlink/options-maximum-size-8192 index 7308553d2b..726893d707 100644 --- a/tests/expected/hardlink/options-maximum-size-8192 +++ b/tests/expected/hardlink/options-maximum-size-8192 @@ -1,33 +1,34 @@ Mode: real +Method: sha256 Files: 26 -Linked: 0 files +Linked: 18 files Compared: 0 xattrs -Compared: 0 files -Saved: 0 B +Compared: 23 files +Saved: 144 KiB Duration: [Redacted] -dir-1/sdir-1/file-a-1 10 8192 1540236423 644 -dir-1/sdir-1/file-a-2 10 8192 1540236423 644 -dir-1/sdir-1/file-a-3 10 8192 1540236423 644 -dir-1/sdir-1/file-b-1 10 8192 1540236430 644 -dir-1/sdir-1/file-b-2 10 8192 1540236430 644 -dir-1/sdir-1/file-b-3 10 8192 1540236430 644 -dir-1/sdir-1/file-c-1 6 8192 1540236548 644 -dir-1/sdir-1/file-c-2 6 8192 1540236548 644 -dir-1/sdir-1/file-c-3 6 8192 1540236548 644 -dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 10 8192 1540236423 644 -dir-2/sdir-2/file-a-5 10 8192 1540236423 644 -dir-2/sdir-2/file-b-5 10 8192 1540236430 644 -dir-2/sdir-3/file-b-4 10 8192 1540236430 644 -file-a-1 10 8192 1540236423 644 -file-a-2 10 8192 1540236423 644 -file-a-3 10 8192 1540236423 644 -file-a-4 10 8192 1540236423 644 -file-a-5 10 8192 1540236423 644 -file-b-1 10 8192 1540236430 644 -file-b-2 10 8192 1540236430 644 -file-b-3 10 8192 1540236430 644 -file-b-4 10 8192 1540236430 644 -file-b-5 10 8192 1540236430 644 -file-c-1 6 8192 1540236548 644 -file-c-2 6 8192 1540236548 644 -file-c-3 6 8192 1540236548 644 +dir-1/sdir-1/file-a-1 5 8192 1540236330 644 +dir-1/sdir-1/file-a-2 5 8192 1540236330 644 +dir-1/sdir-1/file-a-3 2 8192 1540236423 644 +dir-1/sdir-1/file-b-1 4 8192 1540236383 644 +dir-1/sdir-1/file-b-2 4 8192 1540236383 644 +dir-1/sdir-1/file-b-3 2 8192 1540236430 644 +dir-1/sdir-1/file-c-1 4 8192 1540236330 644 +dir-1/sdir-1/file-c-2 4 8192 1540236330 644 +dir-1/sdir-1/file-c-3 2 8192 1540236548 644 +dir-1/sdir-2/file-a-1-abcdefghijklmnopqrstxyz-"§$%&()=?*+ 5 8192 1540236330 644 +dir-2/sdir-2/file-a-5 3 8192 1540236330 600 +dir-2/sdir-2/file-b-5 4 8192 1540236383 640 +dir-2/sdir-3/file-b-4 4 8192 1540236383 640 +file-a-1 5 8192 1540236330 644 +file-a-2 5 8192 1540236330 644 +file-a-3 2 8192 1540236423 644 +file-a-4 3 8192 1540236330 600 +file-a-5 3 8192 1540236330 600 +file-b-1 4 8192 1540236383 644 +file-b-2 4 8192 1540236383 644 +file-b-3 2 8192 1540236430 644 +file-b-4 4 8192 1540236383 640 +file-b-5 4 8192 1540236383 640 +file-c-1 4 8192 1540236330 644 +file-c-2 4 8192 1540236330 644 +file-c-3 2 8192 1540236548 644 diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options index d86acf395f..9c77315a4d 100755 --- a/tests/ts/hardlink/options +++ b/tests/ts/hardlink/options @@ -77,18 +77,16 @@ show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "maximum-size-8191" -# Redact path and duration for reproduciblity -$TS_CMD_HARDLINK -vv --maximum-size 8191 "$SRCDIR" | \ - sed 's:^Skipped .*/tests/output/\(.*\):Skipped [Redacted]/\1:' | \ - sed 's/^Duration: .*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG +create_srcdir +$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" | \ + sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "maximum-size-8192" -# Redact path and duration for reproduciblity -$TS_CMD_HARDLINK -vv --maximum-size 8192 "$SRCDIR" | \ - sed 's:^Skipped .*/tests/output/\(.*\):Skipped [Redacted]/\1:' | \ - sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG +create_srcdir +$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" | \ + sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest