tests: skip m_rootdir_acl if selinux is not disabled

Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>

0012-tests-add-warning-for-selinux-in-m_rootdir_acl.patch

@@ -1,28 +0,0 @@
-From 012560701c876c5630d5d8f17c25227b91037d0e Mon Sep 17 00:00:00 2001
-From: zhanchengbin <zhanchengbin1@huawei.com>
-Date: Wed, 16 Mar 2022 14:56:20 +0800
-Subject: [PATCH] tests: add warning for selinux in m_rootdir_acl
-
-Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
----
- tests/m_rootdir_acl/script | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/m_rootdir_acl/script b/tests/m_rootdir_acl/script
-index e81c82c..8a52543 100644
---- a/tests/m_rootdir_acl/script
-+++ b/tests/m_rootdir_acl/script
-@@ -99,6 +99,10 @@ if [ "$status" = 0 ] ; then
- else
-         echo "$test_name: $test_description: failed"
-         diff $DIFF_OPTS $EXP $OUT > $test_name.failed
-+	selinux=`grep -nRE "^SELINUX=" /etc/selinux/config | awk -F "=" '{print $2}'`
-+	if [ $selinux != "disabled" ] ; then
-+		echo "m_rootdir_acl: selinux is $selinux, please disable it and try again."
-+	fi
- fi
- 
- rm -rf $TMPFILE.cmd $MKFS_DIR
--- 
-1.8.3.1
-

0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch

@@ -0,0 +1,30 @@
+From e71489b24a49899ca016068cbe39ad0576c52eb5 Mon Sep 17 00:00:00 2001
+From: zhanchengbin <zhanchengbin1@huawei.com>
+Date: Thu, 17 Mar 2022 10:53:18 +0800
+Subject: [PATCH] tests: skip m_rootdir_acl if selinux is not disabled
+
+Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
+---
+ tests/m_rootdir_acl/script | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tests/m_rootdir_acl/script b/tests/m_rootdir_acl/script
+index e81c82c..6b78d3d 100644
+--- a/tests/m_rootdir_acl/script
++++ b/tests/m_rootdir_acl/script
+@@ -16,6 +16,12 @@ if [ "$os" = "GNU" ]; then
+ 	return 0
+ fi
+ 
++selinux=`grep -nRE "^SELINUX=" /etc/selinux/config | awk -F "=" '{print $2}'`
++if [ $selinux != "disabled" ]; then
++	echo "$test_name: $test_description: skipped (selinux is not disabled)"
++	return 0
++fi
++
+ MKFS_DIR=$TMPFILE.dir
+ OUT=$test_name.log
+ EXP=$test_dir/expect
+-- 
+1.8.3.1
+

e2fsprogs.spec

@@ -17,7 +17,7 @@ Patch8:		0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch
 Patch9:		0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch		
 Patch10:	0010-tests-update-expect-file-for-u_direct_io.patch
 Patch11:	0011-libext2fs-don-t-old-the-CACHE_MTX-while-doing-I-O.patch
-Patch12:	0012-tests-add-warning-for-selinux-in-m_rootdir_acl.patch
+Patch12:	0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch
 
 
 BuildRequires:  gcc pkgconfig texinfo
@@ -140,8 +140,8 @@ exit 0
 %{_mandir}/man8/*
 
 %changelog
-* Wed Feb 16 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.4-7
+* Thu Feb 17 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.4-7
-- tests: add warning for selinux in m_rootdir_acl
+- tests: skip m_rootdir_acl if selinux is not disabled
 
 * Wed Feb 9 2022 zhanchengbin <zhanchengbin1@huawei.com> - 1.46.4-6
 - libext2fs: don't old the CACHE_MTX while doing I/O