[Audit-test-developer] [PATCH 40/46] rules.mk: empty the 'verify' target

[Jiri J. <jja...@re...>]

The mount options verified by this target are highly fs-specific
and relevant only to ext* filesystems. This target therefore fails
on ie. RHEL7, which uses xfs.

Even on ext* filesystems, these options don't have to be specified
as mount options, in fact the *defaults* for mke2fs are to enable them
in the metadata (see tune2fs -l /dev/sdX | grep 'Default mount').

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 audit-test/rules.mk                              | 20 +++-----------------
 audit-test/trustedprograms/tests/policy/Makefile |  3 +--
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/audit-test/rules.mk b/audit-test/rules.mk
index 4a7ab9e..daedd98 100644
--- a/audit-test/rules.mk
+++ b/audit-test/rules.mk
@@ -102,8 +102,7 @@ endif
 ##########################################################################
 
 .PHONY: all run \
-	clean distclean _clean _distclean \
-	msgque rmlogs showrpms showrpms2
+	clean distclean verify _clean _distclean _verify
 
 all: deps subdirs $(ALL_AR) $(ALL_EXE) $(ALL_SO)
 
@@ -218,22 +217,9 @@ _distclean: clean
 
 distclean: _distclean
 
-# This can be augmented per directory to check things other than the default
-# list in "verify".  (In fact some things should be moved from that list to the
-# appropriate directory)
-verifyme: subdirs
+_verify:
 
-verify:
-	$(MAKE) verifyme
-	@if ! mount | grep -q "^$$(df . | head -n2 | tail -n1 | cut -f1 -d\ ) .*(.*user_xattr"; then \
-		echo "please set 'user_xattr' for this filesystem'"; \
-		exit 1; \
-	fi
-	@if ! mount | grep -q "^$$(df . | head -n2 | tail -n1 | cut -f1 -d\ ) .*(.*acl"; then \
-		echo "please set 'acl' for this filesystem'"; \
-		exit 1; \
-	fi
-	@echo "Looks good!"
+verify: _verify
 
 ##########################################################################
 # Dependency rules
diff --git a/audit-test/trustedprograms/tests/policy/Makefile b/audit-test/trustedprograms/tests/policy/Makefile
index a113fc7..194a6cb 100644
--- a/audit-test/trustedprograms/tests/policy/Makefile
+++ b/audit-test/trustedprograms/tests/policy/Makefile
@@ -37,12 +37,11 @@ TEST_BASEDIR := /usr/local/eal4_testing
 #
 # targets
 #
-.PHONY: verifyme verify distclean
+.PHONY: verify distclean
 
 # base SELinux module targets
 include $(SELINUX_DEV_BASEDIR)/Makefile
 
-verifyme: verify
 verify:
 	@echo "Checking system for basic requirements"
 	@echo -n " SELinux policy RPM version ($(SELINUX_POLICY_RPM)): "; \
-- 
1.8.3.1