From 1b5fc3fe13947baab133bd426f3377e2eb5ccc90 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 8 Jun 2022 11:50:04 +0200 Subject: [PATCH] tests: (hardlink) remove runtime depend output The Method: field depends on kernel crypto support, otherwise hardlink falls back to memcpy(). Fixes: https://github.com/util-linux/util-linux/issues/1710 Signed-off-by: Karel Zak --- .../expected/hardlink/options-maximum-size-8191 | 2 +- .../expected/hardlink/options-maximum-size-8192 | 2 +- tests/ts/hardlink/options | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/expected/hardlink/options-maximum-size-8191 b/tests/expected/hardlink/options-maximum-size-8191 index 30fe1acad4..d57c92ae94 100644 --- a/tests/expected/hardlink/options-maximum-size-8191 +++ b/tests/expected/hardlink/options-maximum-size-8191 @@ -1,6 +1,6 @@ Number of test files: 26 Mode: real -Method: sha256 +Method: [Redacted] Files: 26 Linked: 0 files Compared: 0 xattrs diff --git a/tests/expected/hardlink/options-maximum-size-8192 b/tests/expected/hardlink/options-maximum-size-8192 index 723811e9ee..c571adf52d 100644 --- a/tests/expected/hardlink/options-maximum-size-8192 +++ b/tests/expected/hardlink/options-maximum-size-8192 @@ -1,6 +1,6 @@ Number of test files: 26 Mode: real -Method: sha256 +Method: [Redacted] Files: 26 Linked: 18 files Compared: 0 xattrs diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options index fc1a0d6525..2a1c919a28 100755 --- a/tests/ts/hardlink/options +++ b/tests/ts/hardlink/options @@ -40,6 +40,14 @@ show_srcdir() find "$SRCDIR" -type f -printf "%P\t%n\t%s\t%Ts\t%m\n" | sort } +summary_clean() +{ + sed -i \ + -e 's/^Duration:.*/Duration: [Redacted]/' \ + -e 's/^Method:.*/Method: [Redacted]/' \ + $TS_OUTPUT +} + create_srcdir ts_init_subtest "orig" # just list original dir @@ -80,16 +88,16 @@ ts_finalize_subtest ts_init_subtest "maximum-size-8191" create_srcdir echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT -$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" | \ - sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG +summary_clean show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "maximum-size-8192" create_srcdir echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT -$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" | \ - sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG +summary_clean show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest -- 2.47.3