From: Yu Watanabe Date: Mon, 3 Jul 2023 06:15:27 +0000 (+0900) Subject: test: update test for free area calculation in repart X-Git-Tag: v254-rc1~35^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F28228%2Fhead;p=thirdparty%2Fsystemd.git test: update test for free area calculation in repart --- diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh index a170128de91..c7510dd3fca 100755 --- a/test/units/testsuite-58.sh +++ b/test/units/testsuite-58.sh @@ -1088,7 +1088,7 @@ EOF --json=pretty \ "$imgs/zzz") - # FIXME: the second invocation fails. + # The second invocation output2=$(SYSTEMD_REPART_MKFS_OPTIONS_VFAT="-S 512" systemd-repart \ --definitions="$defs" \ --seed="$seed" \ @@ -1098,7 +1098,9 @@ EOF --sector-size=4096 \ --defer-partitions=esp \ --json=pretty \ - "$imgs/zzz") || : + "$imgs/zzz") + + diff -u <(echo "$output1" | grep -E "(offset|raw_size|raw_padding)") <(echo "$output2" | grep -E "(offset|raw_size|raw_padding)") } test_sector() {