ci: verify marker images consistently

Use grep -F -a to check marker images after test runs.

This affects test evaluation only and does not modify dracut
core logic.

diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
index 849e5325868c46e19eedd2654f3304721c8c8cae..19d1f3340d330664c4769fcc8403c5a7922edb0b 100755 (executable)
--- a/test/TEST-20-STORAGE/test.sh
+++ b/test/TEST-20-STORAGE/test.sh
@@ -157,7 +157,7 @@ test_setup() {
     if [ -n "$HAVE_CRYPT" ] && [ -n "$HAVE_RAID" ]; then
         test_makeroot "raid-crypt" "raid-crypt" " "
 
-        eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)"
+        eval "$(grep -F -a -m 1 MD_UUID "$TESTDIR"/marker.img)"
         echo "$MD_UUID" > "$TESTDIR"/mduuid
 
         eval "$(grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/marker.img)"

diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index ca2cfcc954e111156710a1203e9e4196880e1193..12db9a6a0f7c3a674dd748866bf5df4ff3f18b49 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -84,7 +84,7 @@ test_setup() {
         -append "root=/dev/fakeroot quiet" \
         -initrd "$TESTDIR"/initramfs.makeroot
     test_marker_check dracut-root-block-created
-    cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID "$TESTDIR"/marker.img)
+    cryptoUUIDS=$(grep -F -a -m 3 ID_FS_UUID "$TESTDIR"/marker.img)
     for uuid in $cryptoUUIDS; do
         eval "$uuid"
         printf ' rd.luks.uuid=luks-%s ' "$ID_FS_UUID"

diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index 53fc773ecfe34ae96ed75e425b18f00a3b2713a6..1e43452f8e4ef5196d9d82c8b27f232fccbfd61e 100755 (executable)
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -74,7 +74,7 @@ test_run() {
 
         # Verify that the string "dracut-autooverlay-success" occurs in the second partition in the image file.
         dd if="$TESTDIR"/root.img bs=1MiB status=none \
-            | grep -U --binary-files=binary -F -m 1 -q dracut-autooverlay-success
+            | grep -F -a -m 1 -q dracut-autooverlay-success
     )
 
     return 0

diff --git a/test/test-functions b/test/test-functions
index 1515a04aad97372eea980f8ab547a0055444b873..9d2df77d4ef01bf0a62cbd02a0cbad16d72015c2 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -265,7 +265,7 @@ test_marker_check() {
     local marker=${1:-dracut-root-block-success}
     local file=${2:-marker.img}
 
-    grep -U --binary-files=binary -F -m 1 -q "$marker" "$TESTDIR/$file"
+    grep -F -a -m 1 -q "$marker" "$TESTDIR/$file"
     return $?
 }