From: Mark Hindley Date: Mon, 18 Oct 2021 17:53:01 +0000 (+0000) Subject: tests: Fix test/misc/swaplabel failure due to change in mkswap behaviour. X-Git-Tag: v2.38-rc1~219 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a02721f35b30d4ee0133446f016442f63117ddf6;p=thirdparty%2Futil-linux.git tests: Fix test/misc/swaplabel failure due to change in mkswap behaviour. mkswap now warns if the image file has holes. If fallocate is used to create the file, use POSIX semantics to ensure the file has no holes. This fixes the test failure misc: swaplabel ... FAILED (misc/swaplabel) ========= script: /build/util-linux-2.37.2/tests/ts/misc/swaplabel ================= ================= OUTPUT ===================== 1 Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes) 2 LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab 3 LABEL: 1234567890abcde 4 UUID: 12345678-abcd-abcd-abcd-1234567890ab ================= EXPECTED =================== 1 Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes) 2 LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab 3 LABEL: 1234567890abcde 4 UUID: 12345678-abcd-abcd-abcd-1234567890ab ================= O/E diff =================== ============================================== The additional error appears in swaplabel.err: mkswap: contains holes or other unsupported extents. This swap file can be rejected by kernel on swap activation! Use --verbose for more details. [zeha@debian.org: this appears to be important/required when building inside cowbuilder, on an ext3 filesystem.] Signed-off-by: Mark Hindley --- diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 0801cb213a..8b1abb5c33 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -25,7 +25,7 @@ ts_check_test_command "$TS_HELPER_SYSINFO" # fallocate does not work on most file systems function fallocate_or_skip() { - $TS_CMD_FALLOCATE -l $1 $2 2>/dev/null || \ + $TS_CMD_FALLOCATE -x -l $1 $2 2>/dev/null || \ truncate -s $1 $2 || \ ts_skip "no way to create test image" }