From 074ac625762a0560ad6a1867a21bdfd1fcc4c372 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 26 Feb 2020 17:05:11 +0100
Subject: [PATCH] TEST-04-FULL-SYSTEMD: report failure on rootfs creation

---
 test/TEST-04-FULL-SYSTEMD/create-root.sh | 1 +
 test/TEST-04-FULL-SYSTEMD/test.sh        | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 0a662576c..8a4bdaf97 100755
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 # don't let udev and this script step on eachother's toes
+set -x
 for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
     > "/etc/udev/rules.d/$x"
 done
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 337f02196..4ef6e6726 100755
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -256,8 +256,10 @@ EOF
         -m 512M  -smp 2 -nographic -net none \
         -append "root=/dev/fakeroot rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
         -initrd $TESTDIR/initramfs.makeroot  || return 1
-    grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs || return 1
-
+    if ! grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.btrfs; then
+        echo "Could not create root filesystem"
+        return 1
+    fi
 
     (
         export initdir=$TESTDIR/overlay
-- 
2.39.2