public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] nptl: Reformat Makefile.
@ 2023-05-18 16:52 Carlos O'Donell
0 siblings, 0 replies; 2+ messages in thread
From: Carlos O'Donell @ 2023-05-18 16:52 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b600f47758332d78f04daa970b02a4044a37ebd9
commit b600f47758332d78f04daa970b02a4044a37ebd9
Author: Carlos O'Donell <carlos@redhat.com>
Date: Wed May 17 08:27:59 2023 -0400
nptl: Reformat Makefile.
Reflow all long lines adding comment terminators.
Rename files that cause inconsistent ordering.
Sort all reflowed text using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
Diff:
---
nptl/Makefile | 275 +++++++++++++++++++++---------
nptl/{tst-mutexpi5a.c => tst-mutexpi11.c} | 0
nptl/{tst-mutexpi7a.c => tst-mutexpi12.c} | 0
nptl/{tst-rwlock2a.c => tst-rwlock21.c} | 0
nptl/{tst-rwlock2b.c => tst-rwlock22.c} | 0
5 files changed, 196 insertions(+), 79 deletions(-)
diff --git a/nptl/Makefile b/nptl/Makefile
index 8cec6faee3..f8365467d9 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -207,6 +207,7 @@ routines = \
tpp \
unwind \
vars \
+ # routines
static-only-routines = pthread_atfork
libpthread-routines = libpthread-compat
@@ -270,68 +271,131 @@ LDLIBS-tst-thread-exit-clobber = -lstdc++
CFLAGS-tst-minstack-throw.o = -std=gnu++11
LDLIBS-tst-minstack-throw = -lstdc++
-tests = tst-attr2 tst-attr3 tst-default-attr \
- tst-mutex5a tst-mutex7a \
- tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \
- tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \
- tst-mutexpi9 tst-mutexpi10 \
- tst-cond26 \
- tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
- tst-robustpi6 tst-robustpi7 tst-robustpi9 \
- tst-rwlock2 tst-rwlock2a tst-rwlock2b tst-rwlock3 \
- tst-rwlock6 tst-rwlock7 tst-rwlock8 \
- tst-rwlock9 tst-rwlock10 tst-rwlock11 \
- tst-rwlock15 tst-rwlock17 tst-rwlock18 \
- tst-once5 \
- tst-sem17 \
- tst-tsd3 tst-tsd4 \
- tst-cancel4_1 tst-cancel4_2 \
- tst-cancel7 tst-cancel17 tst-cancel24 \
- tst-signal3 \
- tst-exec4 tst-exec5 \
- tst-stack2 tst-stack3 tst-stack4 \
- tst-pthread-attr-affinity \
- tst-pthread-attr-affinity-fail \
- tst-dlsym1 \
- tst-context1 \
- tst-sched1 \
- tst-initializers1 $(addprefix tst-initializers1-,\
- c89 gnu89 c99 gnu99 c11 gnu11) \
- tst-thread_local1 \
- tst-robust-fork \
- tst-thread-exit-clobber tst-minstack-cancel tst-minstack-exit \
- tst-minstack-throw \
- tst-rwlock-pwn \
- tst-thread-affinity-pthread \
- tst-thread-affinity-pthread2 \
- tst-thread-affinity-sched \
- tst-pthread-defaultattr-free \
- tst-pthread-attr-sigmask \
- tst-pthread-timedlock-lockloop \
- tst-pthread-gdb-attach tst-pthread-gdb-attach-static \
- tst-pthread_exit-nothreads \
- tst-pthread_exit-nothreads-static \
- tst-thread-setspecific
+tests = \
+ tst-attr2 \
+ tst-attr3 \
+ tst-cancel4_1 \
+ tst-cancel4_2 \
+ tst-cancel7 \
+ tst-cancel17 \
+ tst-cancel24 \
+ tst-cond26 \
+ tst-context1 \
+ tst-default-attr \
+ tst-dlsym1 \
+ tst-exec4 \
+ tst-exec5 \
+ tst-initializers1 \
+ tst-initializers1-c11 \
+ tst-initializers1-c89 \
+ tst-initializers1-c99 \
+ tst-initializers1-gnu11 \
+ tst-initializers1-gnu89 \
+ tst-initializers1-gnu99 \
+ tst-minstack-cancel \
+ tst-minstack-exit \
+ tst-minstack-throw \
+ tst-mutex5a \
+ tst-mutex7a \
+ tst-mutexpi1 \
+ tst-mutexpi2 \
+ tst-mutexpi3 \
+ tst-mutexpi4 \
+ tst-mutexpi5 \
+ tst-mutexpi6 \
+ tst-mutexpi7 \
+ tst-mutexpi9 \
+ tst-mutexpi10 \
+ tst-mutexpi11 \
+ tst-mutexpi12 \
+ tst-once5 \
+ tst-pthread-attr-affinity \
+ tst-pthread-attr-affinity-fail \
+ tst-pthread-attr-sigmask \
+ tst-pthread-defaultattr-free \
+ tst-pthread-gdb-attach \
+ tst-pthread-gdb-attach-static \
+ tst-pthread-timedlock-lockloop \
+ tst-pthread_exit-nothreads \
+ tst-pthread_exit-nothreads-static \
+ tst-robust-fork \
+ tst-robustpi1 \
+ tst-robustpi2 \
+ tst-robustpi3 \
+ tst-robustpi4 \
+ tst-robustpi5 \
+ tst-robustpi6 \
+ tst-robustpi7 \
+ tst-robustpi9 \
+ tst-rwlock-pwn \
+ tst-rwlock2 \
+ tst-rwlock3 \
+ tst-rwlock6 \
+ tst-rwlock7 \
+ tst-rwlock8 \
+ tst-rwlock9 \
+ tst-rwlock10 \
+ tst-rwlock11 \
+ tst-rwlock15 \
+ tst-rwlock17 \
+ tst-rwlock18 \
+ tst-rwlock21 \
+ tst-rwlock22 \
+ tst-sched1 \
+ tst-sem17 \
+ tst-signal3 \
+ tst-stack2 \
+ tst-stack3 \
+ tst-stack4 \
+ tst-thread-affinity-pthread \
+ tst-thread-affinity-pthread2 \
+ tst-thread-affinity-sched \
+ tst-thread-exit-clobber \
+ tst-thread-setspecific \
+ tst-thread_local1 \
+ tst-tsd3 \
+ tst-tsd4 \
+ # tests
tests-nolibpthread = \
tst-pthread_exit-nothreads \
tst-pthread_exit-nothreads-static \
+ # tests-nolibpthread
tests-container = tst-pthread-getattr
-tests-internal := tst-robustpi8 tst-rwlock19 tst-rwlock20 \
- tst-sem11 tst-sem12 tst-sem13 \
- tst-barrier5 tst-signal7 tst-mutex8 tst-mutex8-static \
- tst-mutexpi8 tst-mutexpi8-static \
- tst-setgetname \
- tst-cond22 \
-
-xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
- tst-mutexpp1 tst-mutexpp6 tst-mutexpp10 tst-setgroups \
- tst-mutexpp5 tst-mutexpp9
+tests-internal := \
+ tst-barrier5 \
+ tst-cond22 \
+ tst-mutex8 \
+ tst-mutex8-static \
+ tst-mutexpi8 \
+ tst-mutexpi8-static \
+ tst-robustpi8 \
+ tst-rwlock19 \
+ tst-rwlock20 \
+ tst-sem11 \
+ tst-sem12 \
+ tst-sem13 \
+ tst-setgetname \
+ tst-signal7 \
+ # tests-internal
+
+xtests = \
+ tst-mutexpp1 \
+ tst-mutexpp5 \
+ tst-mutexpp6 \
+ tst-mutexpp9 \
+ tst-mutexpp10 \
+ tst-setgroups \
+ tst-setuid1 \
+ tst-setuid1-static \
+ tst-setuid2 \
+ # xtests
tests-time64 := \
tst-cancel4_2-time64
+ # tests-time64
# This test can run into task limits because of a linux kernel bug
# and then cause the make process to fail too, see bug 24537.
@@ -343,9 +407,14 @@ gen-as-const-headers = unwindbuf.sym
gen-py-const-headers := nptl_lock_constants.pysym
pretty-printers := nptl-printers.py
-tests-printers := test-mutexattr-printers test-mutex-printers \
- test-condattr-printers test-cond-printers \
- test-rwlockattr-printers test-rwlock-printers
+tests-printers := \
+ test-cond-printers \
+ test-condattr-printers \
+ test-mutex-printers \
+ test-mutexattr-printers \
+ test-rwlock-printers \
+ test-rwlockattr-printers \
+ # tests-printers
# We must specify both CFLAGS and CPPFLAGS to override any
# compiler options the user might have provided that conflict
@@ -380,25 +449,51 @@ CPPFLAGS-tst-pthread-gdb-attach-static.c := \
# were launched with an explicit ld.so invocation.
tst-pthread-gdb-attach-no-pie = yes
-tests += tst-cancelx7 tst-cancelx17
+tests += \
+ tst-cancelx7 \
+ tst-cancelx17 \
+ # tests
ifeq ($(build-shared),yes)
-tests += tst-compat-forwarder tst-audit-threads
-tests-internal += tst-tls3 tst-tls3-malloc tst-tls5 tst-stackguard1
+tests += \
+ tst-audit-threads \
+ tst-compat-forwarder \
+ # tests
+tests-internal += \
+ tst-stackguard1 \
+ tst-tls3 \
+ tst-tls3-malloc \
+ tst-tls5 \
+ # tests-internal
ifeq ($(have-z-execstack),yes)
tests += tst-execstack
endif
endif
-modules-names = tst-tls3mod \
- tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
- tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \
- tst-execstack-mod \
- tst-compat-forwarder-mod tst-audit-threads-mod1 \
- tst-audit-threads-mod2
-extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \
- tst-cleanup4aux.o tst-cleanupx4aux.o
-test-extras += tst-cleanup4aux tst-cleanupx4aux
+modules-names = \
+ tst-audit-threads-mod1 \
+ tst-audit-threads-mod2 \
+ tst-compat-forwarder-mod \
+ tst-execstack-mod \
+ tst-stack4mod \
+ tst-tls3mod \
+ tst-tls5mod \
+ tst-tls5moda \
+ tst-tls5modb \
+ tst-tls5modc \
+ tst-tls5modd \
+ tst-tls5mode \
+ tst-tls5modf \
+ # modules-names
+extra-test-objs += \
+ $(addsuffix .os,$(strip $(modules-names))) \
+ tst-cleanup4aux.o \
+ tst-cleanupx4aux.o \
+ # extra-test-objs
+test-extras += \
+ tst-cleanup4aux \
+ tst-cleanupx4aux \
+ # test-extras
# This test exercises compat symbols removed in glibc 2.34.
ifdef have-GLIBC_2.33
@@ -436,20 +531,31 @@ CFLAGS-funlockfile.c += $(libio-mtsafe)
link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
$(common-objpfx)libc.a
-tests-static += tst-stackguard1-static \
- tst-cancel24-static \
- tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
- tst-sem12-static tst-cond11-static \
- tst-pthread-gdb-attach-static \
- tst-pthread_exit-nothreads-static
+tests-static += \
+ tst-cancel24-static \
+ tst-mutex8-static \
+ tst-mutexpi8-static \
+ tst-pthread-gdb-attach-static \
+ tst-pthread_exit-nothreads-static \
+ tst-sem11-static \
+ tst-sem12-static tst-cond11-static \
+ tst-stackguard1-static \
+ # tests-static
tests += tst-cancel24-static
-tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static
+tests-internal += \
+ tst-sem11-static \
+ tst-sem12-static \
+ tst-stackguard1-static \
+ # tests-internal
xtests-static += tst-setuid1-static
ifeq ($(run-built-tests),yes)
-tests-special += $(objpfx)tst-stack3-mem.out $(objpfx)tst-oddstacklimit.out
+tests-special += \
+ $(objpfx)tst-oddstacklimit.out \
+ $(objpfx)tst-stack3-mem.out \
+ # tests-special
ifeq ($(build-shared),yes)
tests-special += $(objpfx)tst-tls6.out
endif
@@ -457,8 +563,13 @@ endif
ifeq (,$(CXX))
# These tests require a C++ compiler and runtime.
-tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5 \
- tst-thread-exit-clobber tst-minstack-throw
+tests-unsupported += \
+ tst-cancel24 \
+ tst-cancel24-static \
+ tst-minstack-throw \
+ tst-once5 \
+ tst-thread-exit-clobber \
+ # tests-unsupported
endif
# These tests require a C++ compiler and runtime with thread_local support.
ifneq ($(have-cxx-thread_local),yes)
@@ -504,7 +615,10 @@ tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace \
$(objpfx)tst-stack3-mem.out: $(objpfx)tst-stack3.out
$(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@; \
$(evaluate-test)
-generated += tst-stack3-mem.out tst-stack3.mtrace
+generated += \
+ tst-stack3-mem.out \
+ tst-stack3.mtrace \
+ # generated
tst-stack4mod.sos=$(shell for i in 0 1 2 3 4 5 6 7 8 9 10 \
11 12 13 14 15 16 17 18 19; do \
@@ -546,7 +660,10 @@ LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24)
ifeq ($(build-shared),yes)
-generated += multidir.mk tst-tls6.out
+generated += \
+ multidir.mk \
+ tst-tls6.out \
+ # generated
endif
tst-exec4-ARGS = $(host-test-program-cmd)
diff --git a/nptl/tst-mutexpi5a.c b/nptl/tst-mutexpi11.c
similarity index 100%
rename from nptl/tst-mutexpi5a.c
rename to nptl/tst-mutexpi11.c
diff --git a/nptl/tst-mutexpi7a.c b/nptl/tst-mutexpi12.c
similarity index 100%
rename from nptl/tst-mutexpi7a.c
rename to nptl/tst-mutexpi12.c
diff --git a/nptl/tst-rwlock2a.c b/nptl/tst-rwlock21.c
similarity index 100%
rename from nptl/tst-rwlock2a.c
rename to nptl/tst-rwlock21.c
diff --git a/nptl/tst-rwlock2b.c b/nptl/tst-rwlock22.c
similarity index 100%
rename from nptl/tst-rwlock2b.c
rename to nptl/tst-rwlock22.c
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc] nptl: Reformat Makefile.
@ 2023-05-10 17:16 Carlos O'Donell
0 siblings, 0 replies; 2+ messages in thread
From: Carlos O'Donell @ 2023-05-10 17:16 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f0dbe112f532be2101bb392f67f9f164cade25b0
commit f0dbe112f532be2101bb392f67f9f164cade25b0
Author: Carlos O'Donell <carlos@redhat.com>
Date: Tue Apr 18 11:02:09 2023 -0400
nptl: Reformat Makefile.
Reflow all long lines adding comment terminators.
Sort all reflowed text using scripts/sort-makefile-lines.py.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diff:
---
sysdeps/pthread/Makefile | 433 +++++++++++++++------
.../pthread/{tst-mutex7robust.c => tst-robust11.c} | 0
2 files changed, 320 insertions(+), 113 deletions(-)
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index c2f5588bd9..5df1109dd3 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -21,9 +21,17 @@ $(objpfx)tst-timer: $(librt)
endif
ifneq (,$(filter $(subdir),htl nptl))
-headers += threads.h
-
-routines += thrd_current thrd_equal thrd_sleep thrd_yield pthread_atfork
+headers += \
+ threads.h \
+ # headers
+
+routines += \
+ pthread_atfork \
+ thrd_current \
+ thrd_equal \
+ thrd_sleep \
+ thrd_yield \
+ # routines
$(libpthread-routines-var) += \
call_once \
@@ -48,86 +56,231 @@ $(libpthread-routines-var) += \
tss_delete \
tss_get \
tss_set \
+ # $(libpthread-routines-var)
-tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
- tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \
- tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \
- \
- tst-abstime \
- tst-pt-align tst-pt-align3 \
- tst-attr1 \
- tst-backtrace1 \
- tst-bad-schedattr \
- tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
- tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
- tst-basic7 \
- tst-cancel-self tst-cancel-self-cancelstate \
- tst-cancel-self-canceltype tst-cancel-self-testcancel \
- tst-cancel1 tst-cancel2 tst-cancel3 \
- tst-cancel4 tst-cancel5 \
- tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 \
- tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel16 \
- tst-cancel18 tst-cancel19 tst-cancel20 tst-cancel21 \
- tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \
- tst-cancel29 \
- tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \
- tst-clock1 \
- tst-cond-except \
- tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
- tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
- tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
- tst-cond20 tst-cond21 tst-cond23 tst-cond24 tst-cond25 tst-cond27 \
- tst-create-detached \
- tst-detach1 \
- tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
- tst-exec1 tst-exec2 tst-exec3 \
- tst-exit1 tst-exit2 tst-exit3 \
- tst-flock1 tst-flock2 \
- tst-fork1 tst-fork2 tst-fork3 tst-fork4 \
- tst-atfork1 \
- tst-getpid3 \
- tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \
- tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \
- tst-join14 tst-join15 \
- tst-key1 tst-key2 tst-key3 tst-key4 \
- tst-kill1 tst-kill2 tst-kill3 tst-kill5 tst-kill6 \
- tst-locale1 tst-locale2 \
- tst-memstream \
- tst-mutex-errorcheck tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 \
- tst-mutex5 tst-mutex6 tst-mutex7 tst-mutex7robust tst-mutex9 \
- tst-mutex10 tst-mutex11 tst-pthread-mutexattr \
- tst-once1 tst-once2 tst-once3 tst-once4 \
- tst-pt-popen1 \
- tst-raise1 \
- tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
- tst-robust6 tst-robust7 tst-robust9 tst-robust10 \
- tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \
- tst-rwlock13 tst-rwlock14 tst-rwlock16 \
- tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
- tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
- tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
- tst-setuid3 \
- tst-signal1 tst-signal2 \
- tst-signal4 tst-signal5 tst-signal6 tst-signal8 \
- tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
- tst-stack1 \
- tst-stdio1 tst-stdio2 \
- tst-pt-sysconf \
- tst-pt-tls1 tst-pt-tls2 \
- tst-tsd1 tst-tsd2 tst-tsd5 tst-tsd6 \
- tst-umask1 \
- tst-unload \
- tst-unwind-thread \
- tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \
- tst-pthread-exit-signal \
- tst-pthread-setuid-loop \
- tst-pthread_cancel-exited \
- tst-pthread_cancel-select-loop \
- tst-pthread-raise-blocked-self \
- tst-pthread_kill-exited \
- tst-pthread_kill-exiting \
- tst-cancel30 \
- # tests
+tests += \
+ tst-abstime \
+ tst-atfork1 \
+ tst-attr1 \
+ tst-backtrace1 \
+ tst-bad-schedattr \
+ tst-barrier1 \
+ tst-barrier2 \
+ tst-barrier3 \
+ tst-barrier4 \
+ tst-basic1 \
+ tst-basic2 \
+ tst-basic3 \
+ tst-basic4 \
+ tst-basic5 \
+ tst-basic6 \
+ tst-basic7 \
+ tst-call-once \
+ tst-cancel-self \
+ tst-cancel-self-cancelstate \
+ tst-cancel-self-canceltype \
+ tst-cancel-self-testcancel \
+ tst-cancel1 \
+ tst-cancel2 \
+ tst-cancel3 \
+ tst-cancel4 \
+ tst-cancel5 \
+ tst-cancel6 \
+ tst-cancel8 \
+ tst-cancel9 \
+ tst-cancel10 \
+ tst-cancel11 \
+ tst-cancel12 \
+ tst-cancel13 \
+ tst-cancel14 \
+ tst-cancel15 \
+ tst-cancel16 \
+ tst-cancel18 \
+ tst-cancel19 \
+ tst-cancel20 \
+ tst-cancel21 \
+ tst-cancel22 \
+ tst-cancel23 \
+ tst-cancel26 \
+ tst-cancel27 \
+ tst-cancel28 \
+ tst-cancel29 \
+ tst-cancel30 \
+ tst-cleanup0 \
+ tst-cleanup1 \
+ tst-cleanup2 \
+ tst-cleanup3 \
+ tst-clock1 \
+ tst-cnd-basic \
+ tst-cnd-broadcast \
+ tst-cnd-timedwait \
+ tst-cond-except \
+ tst-cond1 \
+ tst-cond2 \
+ tst-cond3 \
+ tst-cond4 \
+ tst-cond5 \
+ tst-cond6 \
+ tst-cond7 \
+ tst-cond8 \
+ tst-cond9 \
+ tst-cond10 \
+ tst-cond11 \
+ tst-cond12 \
+ tst-cond13 \
+ tst-cond14 \
+ tst-cond15 \
+ tst-cond16 \
+ tst-cond17 \
+ tst-cond18 \
+ tst-cond19 \
+ tst-cond20 \
+ tst-cond21 \
+ tst-cond23 \
+ tst-cond24 \
+ tst-cond25 \
+ tst-cond27 \
+ tst-create-detached \
+ tst-detach1 \
+ tst-eintr2 \
+ tst-eintr3 \
+ tst-eintr4 \
+ tst-eintr5 \
+ tst-exec1 \
+ tst-exec2 \
+ tst-exec3 \
+ tst-exit1 \
+ tst-exit2 \
+ tst-exit3 \
+ tst-flock1 \
+ tst-flock2 \
+ tst-fork1 \
+ tst-fork2 \
+ tst-fork3 \
+ tst-fork4 \
+ tst-getpid3 \
+ tst-join1 \
+ tst-join2 \
+ tst-join3 \
+ tst-join4 \
+ tst-join5 \
+ tst-join6 \
+ tst-join7 \
+ tst-join8 \
+ tst-join9 \
+ tst-join10 \
+ tst-join11 \
+ tst-join12 \
+ tst-join13 \
+ tst-join14 \
+ tst-join15 \
+ tst-key1 \
+ tst-key2 \
+ tst-key3 \
+ tst-key4 \
+ tst-kill1 \
+ tst-kill2 \
+ tst-kill3 \
+ tst-kill5 \
+ tst-kill6 \
+ tst-locale1 \
+ tst-locale2 \
+ tst-memstream \
+ tst-mtx-basic \
+ tst-mtx-recursive \
+ tst-mtx-timedlock \
+ tst-mtx-trylock \
+ tst-mutex-errorcheck \
+ tst-mutex1 \
+ tst-mutex2 \
+ tst-mutex3 \
+ tst-mutex4 \
+ tst-mutex5 \
+ tst-mutex6 \
+ tst-mutex7 \
+ tst-mutex9 \
+ tst-mutex10 \
+ tst-mutex11 \
+ tst-once1 \
+ tst-once2 \
+ tst-once3 \
+ tst-once4 \
+ tst-pt-align \
+ tst-pt-align3 \
+ tst-pt-popen1 \
+ tst-pt-sysconf \
+ tst-pt-tls1 \
+ tst-pt-tls2 \
+ tst-pt-vfork1 \
+ tst-pt-vfork2 \
+ tst-pthread-exit-signal \
+ tst-pthread-mutexattr \
+ tst-pthread-raise-blocked-self \
+ tst-pthread-setuid-loop \
+ tst-pthread_cancel-exited \
+ tst-pthread_cancel-select-loop \
+ tst-pthread_kill-exited \
+ tst-pthread_kill-exiting \
+ tst-raise1 \
+ tst-robust1 \
+ tst-robust2 \
+ tst-robust3 \
+ tst-robust4 \
+ tst-robust5 \
+ tst-robust6 \
+ tst-robust7 \
+ tst-robust9 \
+ tst-robust10 \
+ tst-robust11 \
+ tst-rwlock-tryrdlock-stall \
+ tst-rwlock-trywrlock-stall \
+ tst-rwlock1 \
+ tst-rwlock4 \
+ tst-rwlock5 \
+ tst-rwlock12 \
+ tst-rwlock13 \
+ tst-rwlock14 \
+ tst-rwlock16 \
+ tst-sem1 \
+ tst-sem2 \
+ tst-sem3 \
+ tst-sem4 \
+ tst-sem5 \
+ tst-sem6 \
+ tst-sem7 \
+ tst-sem8 \
+ tst-sem9 \
+ tst-sem10 \
+ tst-sem14 \
+ tst-sem15 \
+ tst-sem16 \
+ tst-setuid3 \
+ tst-signal1 \
+ tst-signal2 \
+ tst-signal4 \
+ tst-signal5 \
+ tst-signal6 \
+ tst-signal8 \
+ tst-spin1 \
+ tst-spin2 \
+ tst-spin3 \
+ tst-spin4 \
+ tst-stack1 \
+ tst-stdio1 \
+ tst-stdio2 \
+ tst-thrd-detach \
+ tst-thrd-sleep \
+ tst-tsd1 \
+ tst-tsd2 \
+ tst-tsd5 \
+ tst-tsd6 \
+ tst-tss-basic \
+ tst-umask1 \
+ tst-unload \
+ tst-unwind-thread \
+ tst-vfork1x \
+ tst-vfork2x \
+ # tests
tests-time64 += \
tst-abstime-time64 \
@@ -138,47 +291,70 @@ tests-time64 += \
tst-rwlock14-time64 \
tst-sem5-time64 \
tst-thrd-sleep-time64 \
+ # tests-time64
static-only-routines = pthread_atfork
# Files which must not be linked with libpthread.
-tests-nolibpthread += tst-unload
+tests-nolibpthread += \
+ tst-unload \
+ # tests-nolibpthread
# GCC-4.9 compiles 'sprintf(NULL, ...)' into UD2 on x86_64 without -fno-builtin
CFLAGS-tst-cleanup2.c += -fno-builtin
CFLAGS-tst-cleanupx2.c += -fno-builtin
-tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \
- tst-cancelx4 tst-cancelx5 \
- tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 \
- tst-cancelx15 tst-cancelx16 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
- tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3
+tests += \
+ tst-cancelx2 \
+ tst-cancelx3 \
+ tst-cancelx4 \
+ tst-cancelx5 \
+ tst-cancelx6 \
+ tst-cancelx8 \
+ tst-cancelx9 \
+ tst-cancelx10 \
+ tst-cancelx11 \
+ tst-cancelx12 \
+ tst-cancelx13 \
+ tst-cancelx14 \
+ tst-cancelx15 \
+ tst-cancelx16 \
+ tst-cancelx18 \
+ tst-cancelx20 \
+ tst-cancelx21 \
+ tst-cleanupx0 \
+ tst-cleanupx1 \
+ tst-cleanupx2 \
+ tst-cleanupx3 \
+ # tests
ifeq ($(build-shared),yes)
tests += \
- tst-atfork2 \
- tst-pt-tls4 \
tst-_res1 \
- tst-fini1 \
- tst-create1 \
+ tst-atfork2 \
tst-atfork3 \
tst-atfork4 \
-# tests
+ tst-create1 \
+ tst-fini1 \
+ tst-pt-tls4 \
+ # tests
-tests-nolibpthread += tst-fini1
+tests-nolibpthread += \
+ tst-fini1 \
+ # tests-nolibpthread
endif
modules-names += \
- tst-atfork2mod \
- tst-tls4moda \
- tst-tls4modb \
tst-_res1mod1 \
tst-_res1mod2 \
- tst-fini1mod \
- tst-create1mod \
+ tst-atfork2mod \
tst-atfork3mod \
tst-atfork4mod \
-# module-names
+ tst-create1mod \
+ tst-fini1mod \
+ tst-tls4moda \
+ tst-tls4modb \
+ # modules-names
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
@@ -192,17 +368,30 @@ ifeq ($(build-shared),yes)
tests: $(test-modules)
endif
+tests-static += \
+ tst-cancel21-static \
+ tst-locale1 \
+ tst-locale2 \
+ # tests-static
-tests-static += tst-locale1 tst-locale2 tst-cancel21-static
-
-tests += tst-cancel21-static tst-cond11-static
+tests += \
+ tst-cancel21-static \
+ tst-cond11-static \
+ # tests
# These tests are linked with libc before libpthread
-tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x
+tests-reverse += \
+ tst-cancel5 \
+ tst-cancel23 \
+ tst-vfork1x \
+ tst-vfork2x \
+ # tests-reverse
ifeq ($(run-built-tests),yes)
ifeq ($(build-shared),yes)
-tests-special += $(objpfx)tst-cleanup0-cmp.out
+tests-special += \
+ $(objpfx)tst-cleanup0-cmp.out \
+ # tests-special
endif
endif
@@ -286,20 +475,38 @@ $(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \
$(objpfx)tst-pt-tls4: $(shared-thread-library)
$(objpfx)tst-pt-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
-generated += tst-atfork2.mtrace
+generated += \
+ tst-atfork2.mtrace \
+ # generated
-generated += $(objpfx)tst-atfork2.mtrace \
- $(addsuffix .so,$(strip $(modules-names)))
+generated += \
+ $(addsuffix .so,$(strip $(modules-names))) \
+ $(objpfx)tst-atfork2.mtrace \
+ # generated
-tests-internal += tst-cancel25 tst-robust8
+tests-internal += \
+ tst-cancel25 \
+ tst-robust8 \
+ # tests-internal
-tests += tst-oncex3 tst-oncex4 tst-oncey3 tst-oncey4
+tests += \
+ tst-oncex3 \
+ tst-oncex4 \
+ tst-oncey3 \
+ tst-oncey4 \
+ # tests
-modules-names += tst-join7mod
+modules-names += \
+ tst-join7mod \
+ # modules-names
ifeq ($(build-shared),yes)
-tests-static += tst-cond8-static
-tests += tst-cond8-static
+tests-static += \
+ tst-cond8-static \
+ # tests-static
+tests += \
+ tst-cond8-static \
+ # tests
endif
CFLAGS-tst-oncex3.c += -fexceptions
diff --git a/sysdeps/pthread/tst-mutex7robust.c b/sysdeps/pthread/tst-robust11.c
similarity index 100%
rename from sysdeps/pthread/tst-mutex7robust.c
rename to sysdeps/pthread/tst-robust11.c
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-18 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-18 16:52 [glibc] nptl: Reformat Makefile Carlos O'Donell
-- strict thread matches above, loose matches on Subject: below --
2023-05-10 17:16 Carlos O'Donell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).