From d96754eaa57657b3acfe4a50612a07da8365a0a2 Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Sat, 17 Dec 2022 00:34:25 +0000 Subject: [PATCH] test(16): check for failure after each sub-test run The test case had a bug where it only checked for at least one of the passing instead of all the subtests passing. --- test/TEST-16-DMSQUASH/test.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh index e781263a5..1535386d9 100755 --- a/test/TEST-16-DMSQUASH/test.sh +++ b/test/TEST-16-DMSQUASH/test.sh @@ -16,15 +16,21 @@ test_run() { "$testdir"/run-qemu \ "${disk_args[@]}" \ -boot order=d \ - -append "rd.live.overlay.overlayfs=1 root=LABEL=dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \ + -append "rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-label/dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \ -initrd "$TESTDIR"/initramfs.testing + test_marker_check || return 1 + + test_marker_reset "$testdir"/run-qemu \ "${disk_args[@]}" \ -boot order=d \ -append "rd.live.image rd.live.overlay.overlayfs=1 root=LABEL=dracut console=ttyS0,115200n81 quiet selinux=0 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 $DEBUGFAIL" \ -initrd "$TESTDIR"/initramfs.testing + test_marker_check || return 1 + + test_marker_reset "$testdir"/run-qemu \ "${disk_args[@]}" \ -boot order=d \ @@ -33,6 +39,7 @@ test_run() { test_marker_check || return 1 + test_marker_reset rootPartitions=$(sfdisk -d "$TESTDIR"/root.img | grep -c 'root\.img[0-9]') [ "$rootPartitions" -eq 1 ] || return 1 -- 2.47.2