From: Glenn Washburn <development@efficientek.com>
Date: Fri, 17 Sep 2021 23:04:01 +0000 (+0000)
Subject: tests: Skip HFS test only when mac_roman module is not loaded and not loadable
X-Git-Tag: grub-2.12-rc1~544
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50a2a039052a98e114113c31519a8afd1d4b1ae0;p=thirdparty%2Fgrub.git

tests: Skip HFS test only when mac_roman module is not loaded and not loadable

Allow the HFS tests to not be skipped if the mac_roman modules is loaded in
the kernel, but not accessible to modprobe.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/tests/hfs_test.in b/tests/hfs_test.in
index d7ec56bef..5b0c5e33e 100644
--- a/tests/hfs_test.in
+++ b/tests/hfs_test.in
@@ -15,7 +15,7 @@ if ! which mkfs.hfs >/dev/null 2>&1; then
    exit 77
 fi
 
-if ! modprobe mac-roman; then
+if ! grep -q mac_roman /proc/modules && ! modprobe mac_roman; then
    echo "no mac-roman support; cannot test HFS."
    exit 77
 fi