aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-03-10 03:18:21 -0500
committerUlrich Drepper <drepper@gmail.com>2011-03-10 03:18:21 -0500
commit33f85a3fb9fe432e0ebf6a3481bc2d5e29cb605f (patch)
tree3aa8e033ef97aaff94c6736a7cbe762ef9118c61
parent6a5ee1029b3966c5ae9adaaa881e255b2880f511 (diff)
downloadglibc-33f85a3fb9fe432e0ebf6a3481bc2d5e29cb605f.tar
glibc-33f85a3fb9fe432e0ebf6a3481bc2d5e29cb605f.tar.gz
glibc-33f85a3fb9fe432e0ebf6a3481bc2d5e29cb605f.tar.bz2
glibc-33f85a3fb9fe432e0ebf6a3481bc2d5e29cb605f.zip
Don't run tests checking xecutable stack when SELinux is enforcing.
-rw-r--r--ChangeLog4
-rw-r--r--elf/Makefile8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f4750b1985..95f0525d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-10 Ulrich Drepper <drepper@gmail.com>
+
+ * elf/Makefile: Don't run tst-execstack* tests of SELinux is enabled.
+
2011-03-06 Ulrich Drepper <drepper@gmail.com>
* elf/dl-load.c (_dl_map_object): If we are looking for the first
diff --git a/elf/Makefile b/elf/Makefile
index c427679c6b..126ae326ce 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -201,11 +201,14 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
tst-audit1 tst-audit2 \
tst-stackguard1 tst-addr1 tst-thrlock \
- tst-unique1 tst-unique2 \
+ tst-unique1 tst-unique2 tst-unique3 \
tst-initorder
# reldep9
test-srcs = tst-pathopt
+selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
+ifneq ($(selinux-enabled),1)
tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
+endif
ifeq (x86_64,$(config-machine))
tests += tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7
endif
@@ -255,6 +258,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
order2mod1 order2mod2 order2mod3 order2mod4 \
tst-unique1mod1 tst-unique1mod2 \
tst-unique2mod1 tst-unique2mod2 \
+ tst-unique3lib \
tst-initordera1 tst-initorderb1 \
tst-initordera2 tst-initorderb2 \
tst-initordera3 tst-initordera4
@@ -1178,6 +1182,8 @@ $(objpfx)tst-unique1.out: $(objpfx)tst-unique1mod1.so \
$(objpfx)tst-unique2: $(libdl) $(objpfx)tst-unique2mod1.so
$(objpfx)tst-unique2.out: $(objpfx)tst-unique2mod2.so
+$(objpfx)tst-unique3: $(objpfx)tst-unique3lib.so
+
$(objpfx)tst-initorder.out: $(objpfx)tst-initorder
$(elf-objpfx)${rtld-installed-name} \
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \