Check in the remaining changes suggested by Stephen...
Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
diff --git a/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile b/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
index 797f94e..0775f5c 100644
--- a/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
+++ b/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
@@ -39,6 +39,7 @@
CHECKPOLICY ?= $(DESTDIR)/usr/bin/checkpolicy
CHECKPOLICY_VERS ?= $(shell $(CHECKPOLICY) -V |cut -f 1 -d ' ')
+POLICY_DEVEL_DIR ?= $(DESTDIR)/usr/share/selinux
INSTALL_DIR := testcases/kernel/security/selinux-testsuite/refpolicy
@@ -53,7 +54,7 @@
TEST_POLICY_DIR := $(TEST_POLICY_DIR)/generic
endif
-MAKE_TARGETS := test_policy.te
+MAKE_TARGETS := test_policy.te test_policy.pp
ifneq ($(CHECKPOLICY_VERS),24)
POLICY_FILES := $(filter-out test_bounds.te,$(POLICY_FILES))
@@ -66,5 +67,13 @@
test_policy.te: $(addprefix $(TEST_POLICY_DIR)/,$(POLICY_FILES))
(cd "$(TEST_POLICY_DIR)" && cat $(POLICY_FILES)) > $@
+test_policy.pp: test_policy.te
+ @set -e; if [ -d "$(POLICY_DEVEL_DIR)" ]; then \
+ $(MAKE) -f $(POLICY_DEVEL_DIR)/Makefile test_policy.pp; \
+ else \
+ echo "ERROR: You must have selinux-policy?-devel? installed."; \
+ false; \
+ fi
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
include $(abs_srcdir)/Makefile.selinux
diff --git a/testcases/kernel/security/selinux-testsuite/tests/file/selinux_file.sh b/testcases/kernel/security/selinux-testsuite/tests/file/selinux_file.sh
index 46632d2..eccd2e2 100755
--- a/testcases/kernel/security/selinux-testsuite/tests/file/selinux_file.sh
+++ b/testcases/kernel/security/selinux-testsuite/tests/file/selinux_file.sh
@@ -193,7 +193,7 @@
fi
# return to $LTPROOT directory
- cd ${PWD}
+ cd ${SAVEPWD}
return $RC
}