Skip to content

Commit

Permalink
Don't run tests checking xecutable stack when SELinux is enforcing.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrich Drepper committed Mar 10, 2011
1 parent 6a5ee10 commit 33f85a3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 7 additions & 1 deletion elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)) \
Expand Down

0 comments on commit 33f85a3

Please sign in to comment.