So they can be checked with htl too. --- nptl/Makefile | 9 ++++----- sysdeps/pthread/Makefile | 2 ++ {nptl => sysdeps/pthread}/tst-rwlock-tryrdlock-stall.c | 0 {nptl => sysdeps/pthread}/tst-rwlock-trywrlock-stall.c | 0 {nptl => sysdeps/pthread}/tst-rwlock1.c | 0 {nptl => sysdeps/pthread}/tst-rwlock13.c | 0 {nptl => sysdeps/pthread}/tst-rwlock16.c | 0 {nptl => sysdeps/pthread}/tst-rwlock4.c | 0 {nptl => sysdeps/pthread}/tst-rwlock5.c | 0 9 files changed, 6 insertions(+), 5 deletions(-) rename {nptl => sysdeps/pthread}/tst-rwlock-tryrdlock-stall.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock-trywrlock-stall.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock1.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock13.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock16.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock4.c (100%) rename {nptl => sysdeps/pthread}/tst-rwlock5.c (100%)
diff --git a/nptl/Makefile b/nptl/Makefile index bf21413c26..3ad3024a39 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -244,10 +244,10 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-robust6 tst-robust7 tst-robust8 tst-robust9 \ tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \ tst-robustpi6 tst-robustpi7 tst-robustpi8 tst-robustpi9 \ - tst-rwlock1 tst-rwlock2 tst-rwlock2a tst-rwlock2b tst-rwlock3 \ - 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-rwlock2 tst-rwlock2a tst-rwlock2b tst-rwlock3 \ + tst-rwlock6 tst-rwlock7 tst-rwlock8 \ + tst-rwlock9 tst-rwlock10 tst-rwlock11 tst-rwlock12 \ + tst-rwlock14 tst-rwlock15 tst-rwlock17 tst-rwlock18 \ tst-once5 \ tst-key1 tst-key2 tst-key3 tst-key4 \ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ @@ -306,7 +306,6 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-thread-exit-clobber tst-minstack-cancel tst-minstack-exit \ tst-minstack-throw \ tst-rwlock-pwn \ - tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \ tst-unwind-thread tests-container = tst-pthread-getattr diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 6b49e33bdc..cceaa91837 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -52,6 +52,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cond-except \ tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \ tst-once1 tst-once2 tst-once3 tst-once4 \ + tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock13 tst-rwlock16 \ + tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \ tst-spin1 tst-spin2 tst-spin3 tst-spin4 tests += tst-oncex3 tst-oncex4 diff --git a/nptl/tst-rwlock-tryrdlock-stall.c b/sysdeps/pthread/tst-rwlock-tryrdlock-stall.c similarity index 100% rename from nptl/tst-rwlock-tryrdlock-stall.c rename to sysdeps/pthread/tst-rwlock-tryrdlock-stall.c diff --git a/nptl/tst-rwlock-trywrlock-stall.c b/sysdeps/pthread/tst-rwlock-trywrlock-stall.c similarity index 100% rename from nptl/tst-rwlock-trywrlock-stall.c rename to sysdeps/pthread/tst-rwlock-trywrlock-stall.c diff --git a/nptl/tst-rwlock1.c b/sysdeps/pthread/tst-rwlock1.c similarity index 100% rename from nptl/tst-rwlock1.c rename to sysdeps/pthread/tst-rwlock1.c diff --git a/nptl/tst-rwlock13.c b/sysdeps/pthread/tst-rwlock13.c similarity index 100% rename from nptl/tst-rwlock13.c rename to sysdeps/pthread/tst-rwlock13.c diff --git a/nptl/tst-rwlock16.c b/sysdeps/pthread/tst-rwlock16.c similarity index 100% rename from nptl/tst-rwlock16.c rename to sysdeps/pthread/tst-rwlock16.c diff --git a/nptl/tst-rwlock4.c b/sysdeps/pthread/tst-rwlock4.c similarity index 100% rename from nptl/tst-rwlock4.c rename to sysdeps/pthread/tst-rwlock4.c diff --git a/nptl/tst-rwlock5.c b/sysdeps/pthread/tst-rwlock5.c similarity index 100% rename from nptl/tst-rwlock5.c rename to sysdeps/pthread/tst-rwlock5.c -- 2.24.1