From 25795c73a8c3f309aaa296e803cd8f7a2894119c Mon Sep 17 00:00:00 2001
From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Thu, 23 Jan 2025 19:37:53 -0500
Subject: [PATCH] ci: restore regression for console messages

BASIC, UEFI, DMSQUASH tests did not had some of the
kernel command line options properly set
---
 test/TEST-10-BASIC/test.sh    | 2 +-
 test/TEST-12-UEFI/test.sh     | 4 ++--
 test/TEST-30-DMSQUASH/test.sh | 3 +--
 test/test-functions           | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/TEST-10-BASIC/test.sh b/test/TEST-10-BASIC/test.sh
index 2979348df..63a0de738 100755
--- a/test/TEST-10-BASIC/test.sh
+++ b/test/TEST-10-BASIC/test.sh
@@ -12,6 +12,7 @@ test_run() {
 
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
+        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1
@@ -28,7 +29,6 @@ test_setup() {
 
     test_dracut \
         --omit systemd \
-        --kernel-cmdline "$TEST_KERNEL_CMDLINE root=LABEL=dracut" \
         "$TESTDIR"/initramfs.testing
 }
 
diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh
index b57790e1d..2b6edf53d 100755
--- a/test/TEST-12-UEFI/test.sh
+++ b/test/TEST-12-UEFI/test.sh
@@ -64,12 +64,12 @@ test_setup() {
         ukify build \
             --linux="$VMLINUZ" \
             --initrd="$TESTDIR"/initramfs.testing \
-            --cmdline='root=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root' \
+            --cmdline="$TEST_KERNEL_CMDLINE root=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root" \
             --output="$TESTDIR"/ESP/EFI/BOOT/BOOTX64.efi
     else
         echo "Using dracut to create UKI"
         test_dracut \
-            --kernel-cmdline 'root=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root' \
+            --kernel-cmdline "$TEST_KERNEL_CMDLINE root=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root" \
             --drivers 'squashfs' \
             --uefi \
             "$TESTDIR"/ESP/EFI/BOOT/BOOTX64.efi
diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index b688435b2..7655977ab 100755
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -30,7 +30,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "$client_opts" \
+        -append "$TEST_KERNEL_CMDLINE rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-label/dracut $client_opts" \
         -initrd "$TESTDIR"/initramfs.testing
 
     if ! test_marker_check; then
@@ -129,7 +129,6 @@ EOF
     test_dracut \
         --no-hostonly \
         --modules "dmsquash-live-autooverlay" \
-        --kernel-cmdline "$TEST_KERNEL_CMDLINE rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-label/dracut" \
         "$TESTDIR"/initramfs.testing
 }
 
diff --git a/test/test-functions b/test/test-functions
index 16b8acb3b..818528edc 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -18,7 +18,7 @@ if [[ -z $basedir ]]; then basedir="$(realpath ../..)"; fi
 DRACUT=${DRACUT-dracut}
 PKGLIBDIR=${PKGLIBDIR-$basedir}
 
-TEST_KERNEL_CMDLINE+=" rd.retry=10 rd.timeout=30 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot console=ttyS0,115200n81 $DEBUGFAIL "
+TEST_KERNEL_CMDLINE+=" rd.retry=10 rd.timeout=30 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot console=ttyS0 $DEBUGFAIL "
 if [[ $V != "1" && $V != "2" ]]; then
     TEST_KERNEL_CMDLINE+="quiet "
 fi
-- 
2.47.3