From 99d291eee92ad13a8b4fcc9bdf0b0a096083d8d2 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 25 Feb 2022 15:09:07 +0100 Subject: [PATCH] test: accept both unpadded and padded partition sizes Since util-linux/util-linux@921c7da55ec78350e4067b3fd6b7de6f299106ee libfdisk aligns the last partition (on GPT) for optimal I/O. Let's account for that. Fixes: #22606 (cherry picked from commit d490188b8f6da658d8086dd53b7db95735e5cca1) --- test/units/testsuite-58.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh index 78c25051a2..42c31b71b8 100755 --- a/test/units/testsuite-58.sh +++ b/test/units/testsuite-58.sh @@ -129,8 +129,9 @@ systemd-repart --pretty=yes --definitions /tmp/testsuite-58-issue-21817-defs/ "$ sfdisk --dump "$LOOP" | tee /tmp/testsuite-58-issue-21817.dump losetup -d "$LOOP" -grep -qF 'p1 : start= 2048, size= 102400, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709,' /tmp/testsuite-58-issue-21817.dump -grep -qF 'p2 : start= 104448, size= 100319,' /tmp/testsuite-58-issue-21817.dump +grep -qiF "p1 : start= 2048, size= 102400, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709," /tmp/testsuite-58-issue-21817.dump +# Accept both unpadded (pre-v2.38 util-linux) and padded (v2.38+ util-linux) sizes +grep -qE "p2 : start= 104448, size= (100319| 98304)," /tmp/testsuite-58-issue-21817.dump rm /tmp/testsuite-58-issue-21817.img /tmp/testsuite-58-issue-21817.dump rm -r /tmp/testsuite-58-issue-21817-defs/ -- 2.25.1