Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
NPTL: Build tests using clone directly only for Linux.
  • Loading branch information
Roland McGrath committed Feb 6, 2015
1 parent 62ad2ab commit 9e7265f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 8 deletions.
16 changes: 16 additions & 0 deletions ChangeLog
@@ -1,5 +1,21 @@
2015-02-06 Roland McGrath <roland@hack.frob.com>

* nptl/tst-align2.c: Moved ...
* sysdeps/unix/sysv/linux/tst-align-clone.c: ... here.
* nptl/Makefile (tests): Remove tst-align2.
* sysdeps/unix/sysv/linux/Makefile
[$(subdir) = nptl] (tests): Add tst-align-clone.
* nptl/tst-getpid1.c: Moved ...
* sysdeps/unix/sysv/linux/tst-getpid1.c: ... here.
* nptl/tst-getpid2.c: Moved ...
* sysdeps/unix/sysv/linux/tst-getpid2.c: ... here.
* nptl/Makefile (tests): Move tst-getpid1 and tst-getpid2 ...
* sysdeps/unix/sysv/linux/Makefile
[$(subdir) = nptl] (tests): ... here.
* nptl/Makefile (tst-getpid2-ENV): Move variable ...
* sysdeps/unix/sysv/linux/Makefile
[$(subdir) = nptl] (tst-getpid2-ENV): ... here.

* nptl/tst-cleanup2.c (do_test): Use signal rather than sigaction.
Drop trailing \n from perror argument. Use return rather than exit.

Expand Down
9 changes: 2 additions & 7 deletions nptl/Makefile
Expand Up @@ -229,7 +229,7 @@ tests = tst-typesizes \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
tst-sem8 tst-sem9 tst-sem10 tst-sem11 tst-sem12 tst-sem13 tst-sem14 \
tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
tst-align tst-align2 tst-align3 \
tst-align tst-align3 \
tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
tst-basic7 \
tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
Expand Down Expand Up @@ -269,7 +269,7 @@ tests = tst-typesizes \
tst-backtrace1 \
tst-abstime \
tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
tst-getpid1 tst-getpid2 tst-getpid3 \
tst-getpid3 \
tst-setuid3 \
tst-initializers1 $(addprefix tst-initializers1-,c89 gnu89 c99 gnu99) \
tst-bad-schedattr
Expand Down Expand Up @@ -463,11 +463,6 @@ tst-cancel7-ARGS = --command "exec $(host-test-program-cmd)"
tst-cancelx7-ARGS = $(tst-cancel7-ARGS)
tst-umask1-ARGS = $(objpfx)tst-umask1.temp

# In this test, we create a CLONE_VM "thread" that shares TLS storage
# with the original thread. Both threads then race in ld.so with lazy PLT
# resolution. Avoid this race by disabling lazy binding. BZ #11214.
tst-getpid2-ENV = LD_BIND_NOW=1

$(objpfx)tst-atfork2: $(libdl) $(shared-thread-library)
LDFLAGS-tst-atfork2 = -rdynamic
tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace
Expand Down
7 changes: 6 additions & 1 deletion sysdeps/unix/sysv/linux/Makefile
Expand Up @@ -196,5 +196,10 @@ CFLAGS-gai.c += -DNEED_NETLINK
endif

ifeq ($(subdir),nptl)
tests += tst-setgetname
tests += tst-setgetname tst-align-clone tst-getpid1 tst-getpid2

# In this test, we create a CLONE_VM "thread" that shares TLS storage
# with the original thread. Both threads then race in ld.so with lazy PLT
# resolution. Avoid this race by disabling lazy binding. BZ #11214.
tst-getpid2-ENV = LD_BIND_NOW=1
endif
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9e7265f

Please sign in to comment.