Re: [LTP] regression: selinux testsuite broken since October

["Serge E. Hallyn" <serue@us.ibm.com>]

Quoting Stephen Smalley (sds@tycho.nsa.gov):
> It seems the Makefile rewrite last October broke the selinux testsuite.
> Is it unreasonable to expect that someone who rewrote the Makefile would
> actually try running the testsuite?
> 
> Please, revert the changes or fix them.
> 
> See testcases/kernel/security/selinux-testsuite/README for the
> instructions.

Frankly I think reverting the Makefiles is best since it doesn't get
auto-compiled anyway.  The new Makefile is much longer and more complicated
for no apparent gain.

The following patch makes policy compilation work on rhel 5, but I doubt
it'll work anywhere else.

Running the testsuite still fails due to the change to running ltp from
a different dir (i.e.
/usr/bin/chcon: /root/ltp-full-20091231/testcases/bin: No such file or directory
).

-serge

diff -Nrup ltp-full-20091231.orig/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile ltp-full-20091231/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile
--- ltp-full-20091231.orig/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile	2009-10-10 19:53:29.000000000 -0400
+++ ltp-full-20091231/testcases/kernel/security/selinux-testsuite/refpolicy/Makefile	2010-01-06 13:43:19.000000000 -0500
@@ -33,19 +33,16 @@ CHECKPOLICY_VERS	?= $(shell $(CHECKPOLIC
 
 CLEAN_TARGETS		:= test_policy.te
 
-INSTALL_TARGETS		:= *.te
+INSTALL_TARGETS		:= $(REDHAT_VERS)/*.te
+INSTALL_TARGETS_FULL	:= $(builddir)/redhat/$(REDHAT_VERS)/*.te
 
 ifeq ($(CHECKPOLICY_VERS),24)
 INSTALL_TARGETS		:= $(filter-out %/test_bounds.te,$(INSTALL_TARGETS))
+INSTALL_TARGES_FULL		:= $(filter-out %/test_bounds.te,$(INSTALL_TARGES_FULL))
 endif
 
 TE_SRCDIR		:= $(abs_srcdir)
 
-ifeq (redhat-release-, $(findstring redhat-release-, $(REDHAT_RELEASE)))
-ifneq ($(wildcard $(abs_srcdir)/redhat/$(REDHAT_VER)),)
-TE_SRCDIR		:= $(abs_srcdir)/redhat/$(REDHAT_VER)
-endif
-endif
 
 .PHONY: all clean cleanup install load
 
@@ -60,14 +57,18 @@ cleanup:
 install: all
 
 # load remains for backwards compatibility...
-load: $(builddir)/test_policy.te
+load:
+ifeq (redhat-release-, $(findstring redhat-release-, $(REDHAT_RELEASE)))
+	$(MAKE) -C redhat/$(REDHAT_VERS)
+else
 	@if [ -d "$(POLICYDEVEL)" ]; then \
-	    cp -p $(builddir)/test_policy.* $(INSTALL_TARGETS) $(POLICY_DEVEL); \
+	    cp -p $(builddir)/test_policy.* $(INSTALL_TARGETS_FULL) $(POLICYDEVEL); \
 	    $(MAKE) -C $(POLICYDEVEL) clean test_policy.pp; \
 	    $(SEMODULE) -i $(POLICYDEVEL)/test_policy.pp; \
 	else \
             echo "ERROR: You must have selinux-policy-devel installed."; \
 	fi
+endif
 
 $(builddir)/test_policy.te:
 	(cd "$(TE_SRCDIR)" && cat $(INSTALL_TARGETS)) > "$@";

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list