diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 19:50:21 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 19:50:21 +0000 |
| commit | 28c30a6232aa9a54783c146590498a061fc0112a (patch) | |
| tree | be91a57e6b2895cec3d761d10469483c173fcb6c | |
| parent | 52b6cdb4e32dc9a32a81c68974f34db04db47c82 (diff) | |
| download | glibc-28c30a6232aa9a54783c146590498a061fc0112a.tar glibc-28c30a6232aa9a54783c146590498a061fc0112a.tar.gz glibc-28c30a6232aa9a54783c146590498a061fc0112a.tar.bz2 glibc-28c30a6232aa9a54783c146590498a061fc0112a.zip | |
pthread: Move most once tests from nptl to sysdeps/pthread
So they can be checked with htl too.
| -rw-r--r-- | nptl/Makefile | 7 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-once1.c (renamed from nptl/tst-once1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-once2.c (renamed from nptl/tst-once2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-once3.c (renamed from nptl/tst-once3.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-once4.c (renamed from nptl/tst-once4.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-oncex3.c (renamed from nptl/tst-oncex3.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-oncex4.c (renamed from nptl/tst-oncex4.c) | 0 |
8 files changed, 8 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 8fadd1d025..bf21413c26 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -248,7 +248,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-rwlock4 tst-rwlock5 tst-rwlock6 tst-rwlock7 tst-rwlock8 \ tst-rwlock9 tst-rwlock10 tst-rwlock11 tst-rwlock12 tst-rwlock13 \ tst-rwlock14 tst-rwlock15 tst-rwlock16 tst-rwlock17 tst-rwlock18 \ - tst-once1 tst-once2 tst-once3 tst-once4 tst-once5 \ + tst-once5 \ tst-key1 tst-key2 tst-key3 tst-key4 \ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ tst-sem8 tst-sem9 tst-sem10 tst-sem14 \ @@ -375,8 +375,7 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \ tst-cancelx6 tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 \ tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \ tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \ - tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \ - tst-oncex3 tst-oncex4 + tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 ifeq ($(build-shared),yes) tests += tst-atfork2 tst-tls4 tst-_res1 tst-fini1 tst-compat-forwarder \ tst-audit-threads @@ -516,8 +515,6 @@ CFLAGS-tst-cleanupx2.c += -fexceptions CFLAGS-tst-cleanupx3.c += -fexceptions CFLAGS-tst-cleanupx4.c += -fexceptions CFLAGS-tst-cleanupx4aux.c += -fexceptions -CFLAGS-tst-oncex3.c += -fexceptions -CFLAGS-tst-oncex4.c += -fexceptions CFLAGS-tst-align.c += $(stack-align-test-flags) CFLAGS-tst-align3.c += $(stack-align-test-flags) CFLAGS-tst-initializers1.c += -W -Wall -Werror diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 2c33c5c904..6b49e33bdc 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -51,11 +51,17 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cond23 tst-cond24 tst-cond25 \ tst-cond-except \ tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \ + tst-once1 tst-once2 tst-once3 tst-once4 \ tst-spin1 tst-spin2 tst-spin3 tst-spin4 +tests += tst-oncex3 tst-oncex4 + ifeq ($(build-shared),yes) tests-static += tst-cond8-static tests += tst-cond8-static endif +CFLAGS-tst-oncex3.c += -fexceptions +CFLAGS-tst-oncex4.c += -fexceptions + endif diff --git a/nptl/tst-once1.c b/sysdeps/pthread/tst-once1.c index 16a5d8f18d..16a5d8f18d 100644 --- a/nptl/tst-once1.c +++ b/sysdeps/pthread/tst-once1.c diff --git a/nptl/tst-once2.c b/sysdeps/pthread/tst-once2.c index 15c6efa5d4..15c6efa5d4 100644 --- a/nptl/tst-once2.c +++ b/sysdeps/pthread/tst-once2.c diff --git a/nptl/tst-once3.c b/sysdeps/pthread/tst-once3.c index 4e339de6d6..4e339de6d6 100644 --- a/nptl/tst-once3.c +++ b/sysdeps/pthread/tst-once3.c diff --git a/nptl/tst-once4.c b/sysdeps/pthread/tst-once4.c index abcb164552..abcb164552 100644 --- a/nptl/tst-once4.c +++ b/sysdeps/pthread/tst-once4.c diff --git a/nptl/tst-oncex3.c b/sysdeps/pthread/tst-oncex3.c index 08225b88dc..08225b88dc 100644 --- a/nptl/tst-oncex3.c +++ b/sysdeps/pthread/tst-oncex3.c diff --git a/nptl/tst-oncex4.c b/sysdeps/pthread/tst-oncex4.c index 9b4d98f3f1..9b4d98f3f1 100644 --- a/nptl/tst-oncex4.c +++ b/sysdeps/pthread/tst-oncex4.c |