about summary refs log tree commit diff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-24 17:13:24 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-24 17:13:24 +0000
commit0bf57f872cb14db88ca8860e9f5b295e38394f16 (patch)
treef6c7c002b3ab821e0fd2bcc0dca008cef65411d7 /nptl/Makefile
parent8175a2532bd19cca1592f9c7f598302c5ae3770a (diff)
downloadglibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.tar.gz
glibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.tar.xz
glibc-0bf57f872cb14db88ca8860e9f5b295e38394f16.zip
Don't set resource limits in tst-oddstacklimit-ENV.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 02db930b6c..21a876652e 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -257,20 +257,16 @@ tests = tst-typesizes \
 	tst-context1 \
 	tst-sched1 \
 	tst-backtrace1 \
-	tst-oddstacklimit \
 	tst-abstime \
 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
 	tst-getpid1 tst-getpid2 tst-getpid3 \
 	tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
 xtests = tst-setuid1 tst-setuid1-static tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
+test-srcs = tst-oddstacklimit
 
 # Files which must not be linked with libpthread.
 tests-nolibpthread = tst-unload
 
-# This sets the stack resource limit to 1023kb, which is not a multiple
-# of the page size since every architecture's page size is > 1k.
-tst-oddstacklimit-ENV = ; ulimit -s 1023;
-
 gen-as-const-headers = pthread-errnos.sym
 
 LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
@@ -606,6 +602,13 @@ $(objpfx)tst-fini1mod.so: $(shared-thread-library)
 tst-stackguard1-ARGS = --command "$(host-built-program-cmd) --child"
 tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
 
+ifeq ($(run-built-tests),yes)
+tests: $(objpfx)tst-oddstacklimit.out
+
+$(objpfx)tst-oddstacklimit.out: $(objpfx)tst-oddstacklimit $(objpfx)tst-basic1
+	$(run-program-prefix) $< --command '$(host-built-program-cmd)' > $@
+endif
+
 # The tests here better do not run in parallel
 ifneq ($(filter %tests,$(MAKECMDGOALS)),)
 .NOTPARALLEL: