From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26404 invoked by alias); 9 Feb 2020 19:27:38 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 26381 invoked by uid 9944); 9 Feb 2020 19:27:37 -0000 Date: Sun, 09 Feb 2020 19:27:00 -0000 Message-ID: <20200209192737.26380.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] pthread: Move most cond tests from nptl to sysdeps/pthread X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: faae4b2bdd692d929037c80c3315f716f02f3b00 X-Git-Newrev: d8f1f2d9ab2144b589fdac3e381cd86e71871e43 X-SW-Source: 2020-q1/txt/msg00332.txt https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d8f1f2d9ab2144b589fdac3e381cd86e71871e43 commit d8f1f2d9ab2144b589fdac3e381cd86e71871e43 Author: Samuel Thibault Date: Sun Feb 9 19:17:51 2020 +0000 pthread: Move most cond tests from nptl to sysdeps/pthread So they can be checked with htl too. Diff: --- nptl/Makefile | 11 +++-------- sysdeps/mach/hurd/i386/Makefile | 11 +++++++++++ sysdeps/pthread/Makefile | 10 ++++++++++ {nptl => sysdeps/pthread}/tst-cond-except.c | 0 {nptl => sysdeps/pthread}/tst-cond1.c | 0 {nptl => sysdeps/pthread}/tst-cond10.c | 0 {nptl => sysdeps/pthread}/tst-cond11-static.c | 0 {nptl => sysdeps/pthread}/tst-cond11.c | 0 {nptl => sysdeps/pthread}/tst-cond12.c | 0 {nptl => sysdeps/pthread}/tst-cond13.c | 0 {nptl => sysdeps/pthread}/tst-cond14.c | 0 {nptl => sysdeps/pthread}/tst-cond15.c | 0 {nptl => sysdeps/pthread}/tst-cond16.c | 2 ++ {nptl => sysdeps/pthread}/tst-cond17.c | 0 {nptl => sysdeps/pthread}/tst-cond18.c | 2 ++ {nptl => sysdeps/pthread}/tst-cond19.c | 0 {nptl => sysdeps/pthread}/tst-cond2.c | 0 {nptl => sysdeps/pthread}/tst-cond22.c | 0 {nptl => sysdeps/pthread}/tst-cond23.c | 0 {nptl => sysdeps/pthread}/tst-cond24.c | 0 {nptl => sysdeps/pthread}/tst-cond25.c | 0 {nptl => sysdeps/pthread}/tst-cond26.c | 0 {nptl => sysdeps/pthread}/tst-cond27.c | 0 {nptl => sysdeps/pthread}/tst-cond3.c | 0 {nptl => sysdeps/pthread}/tst-cond4.c | 0 {nptl => sysdeps/pthread}/tst-cond5.c | 0 {nptl => sysdeps/pthread}/tst-cond6.c | 0 {nptl => sysdeps/pthread}/tst-cond7.c | 0 {nptl => sysdeps/pthread}/tst-cond8-static.c | 0 {nptl => sysdeps/pthread}/tst-cond8.c | 0 {nptl => sysdeps/pthread}/tst-cond9.c | 0 31 files changed, 28 insertions(+), 8 deletions(-) diff --git a/nptl/Makefile b/nptl/Makefile index 51a0be0..8fadd1d 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -239,12 +239,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-mutex7robust tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \ tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \ tst-mutexpi9 \ - 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-cond22 tst-cond23 tst-cond24 tst-cond25 \ - tst-cond26 tst-cond27 \ - tst-cond-except \ + tst-cond11 tst-cond20 tst-cond21 tst-cond22 tst-cond26 tst-cond27 \ tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \ tst-robust6 tst-robust7 tst-robust8 tst-robust9 \ tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \ @@ -450,12 +445,12 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \ $(common-objpfx)libc.a tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \ - tst-cancel21-static tst-cancel24-static tst-cond8-static \ + tst-cancel21-static tst-cancel24-static \ tst-mutex8-static tst-mutexpi8-static tst-sem11-static \ tst-sem12-static tst-cond11-static tests += tst-cancel21-static tst-cancel24-static \ - tst-cond8-static tst-cond11-static + tst-cond11-static tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static xtests-static += tst-setuid1-static diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile index 584d927..fa89fc1 100644 --- a/sysdeps/mach/hurd/i386/Makefile +++ b/sysdeps/mach/hurd/i386/Makefile @@ -104,6 +104,17 @@ endif # For bug 25521 ifeq ($(subdir),htl) test-xfail-tst-mutex4 = yes +test-xfail-tst-cond4 = yes +test-xfail-tst-cond6 = yes +test-xfail-tst-cond12 = yes +test-xfail-tst-cond13 = yes +test-xfail-tst-cond23 = yes +endif + +# For bug 25522 +ifeq ($(subdir),htl) +test-xfail-tst-cond24 = yes +test-xfail-tst-cond25 = yes endif ifeq ($(subdir),elf) diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 5117110..2c33c5c 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -45,7 +45,17 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-attr1 \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ tst-basic7 \ + tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \ + tst-cond8 tst-cond9 tst-cond10 tst-cond12 tst-cond13 \ + tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \ + tst-cond23 tst-cond24 tst-cond25 \ + tst-cond-except \ tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \ tst-spin1 tst-spin2 tst-spin3 tst-spin4 +ifeq ($(build-shared),yes) +tests-static += tst-cond8-static +tests += tst-cond8-static +endif + endif diff --git a/nptl/tst-cond-except.c b/sysdeps/pthread/tst-cond-except.c similarity index 100% rename from nptl/tst-cond-except.c rename to sysdeps/pthread/tst-cond-except.c diff --git a/nptl/tst-cond1.c b/sysdeps/pthread/tst-cond1.c similarity index 100% rename from nptl/tst-cond1.c rename to sysdeps/pthread/tst-cond1.c diff --git a/nptl/tst-cond10.c b/sysdeps/pthread/tst-cond10.c similarity index 100% rename from nptl/tst-cond10.c rename to sysdeps/pthread/tst-cond10.c diff --git a/nptl/tst-cond11-static.c b/sysdeps/pthread/tst-cond11-static.c similarity index 100% rename from nptl/tst-cond11-static.c rename to sysdeps/pthread/tst-cond11-static.c diff --git a/nptl/tst-cond11.c b/sysdeps/pthread/tst-cond11.c similarity index 100% rename from nptl/tst-cond11.c rename to sysdeps/pthread/tst-cond11.c diff --git a/nptl/tst-cond12.c b/sysdeps/pthread/tst-cond12.c similarity index 100% rename from nptl/tst-cond12.c rename to sysdeps/pthread/tst-cond12.c diff --git a/nptl/tst-cond13.c b/sysdeps/pthread/tst-cond13.c similarity index 100% rename from nptl/tst-cond13.c rename to sysdeps/pthread/tst-cond13.c diff --git a/nptl/tst-cond14.c b/sysdeps/pthread/tst-cond14.c similarity index 100% rename from nptl/tst-cond14.c rename to sysdeps/pthread/tst-cond14.c diff --git a/nptl/tst-cond15.c b/sysdeps/pthread/tst-cond15.c similarity index 100% rename from nptl/tst-cond15.c rename to sysdeps/pthread/tst-cond15.c diff --git a/nptl/tst-cond16.c b/sysdeps/pthread/tst-cond16.c similarity index 98% rename from nptl/tst-cond16.c rename to sysdeps/pthread/tst-cond16.c index 61e3cbe..daadd87 100644 --- a/nptl/tst-cond16.c +++ b/sysdeps/pthread/tst-cond16.c @@ -76,8 +76,10 @@ do_test (void) int i, ret, sz; pthread_attr_init (&attr); sz = sysconf (_SC_PAGESIZE); +#ifdef PTHREAD_STACK_MIN if (sz < PTHREAD_STACK_MIN) sz = PTHREAD_STACK_MIN; +#endif pthread_attr_setstacksize (&attr, sz); for (i = 0; i < count; ++i) if ((ret = pthread_create (&th[i], &attr, tf, NULL)) != 0) diff --git a/nptl/tst-cond17.c b/sysdeps/pthread/tst-cond17.c similarity index 100% rename from nptl/tst-cond17.c rename to sysdeps/pthread/tst-cond17.c diff --git a/nptl/tst-cond18.c b/sysdeps/pthread/tst-cond18.c similarity index 98% rename from nptl/tst-cond18.c rename to sysdeps/pthread/tst-cond18.c index f984c3c..38c35d7 100644 --- a/nptl/tst-cond18.c +++ b/sysdeps/pthread/tst-cond18.c @@ -88,8 +88,10 @@ do_test (void) int i, ret, sz; pthread_attr_init (&attr); sz = sysconf (_SC_PAGESIZE); +#ifdef PTHREAD_STACK_MIN if (sz < PTHREAD_STACK_MIN) sz = PTHREAD_STACK_MIN; +#endif pthread_attr_setstacksize (&attr, sz); for (i = 0; i <= count; ++i) diff --git a/nptl/tst-cond19.c b/sysdeps/pthread/tst-cond19.c similarity index 100% rename from nptl/tst-cond19.c rename to sysdeps/pthread/tst-cond19.c diff --git a/nptl/tst-cond2.c b/sysdeps/pthread/tst-cond2.c similarity index 100% rename from nptl/tst-cond2.c rename to sysdeps/pthread/tst-cond2.c diff --git a/nptl/tst-cond22.c b/sysdeps/pthread/tst-cond22.c similarity index 100% rename from nptl/tst-cond22.c rename to sysdeps/pthread/tst-cond22.c diff --git a/nptl/tst-cond23.c b/sysdeps/pthread/tst-cond23.c similarity index 100% rename from nptl/tst-cond23.c rename to sysdeps/pthread/tst-cond23.c diff --git a/nptl/tst-cond24.c b/sysdeps/pthread/tst-cond24.c similarity index 100% rename from nptl/tst-cond24.c rename to sysdeps/pthread/tst-cond24.c diff --git a/nptl/tst-cond25.c b/sysdeps/pthread/tst-cond25.c similarity index 100% rename from nptl/tst-cond25.c rename to sysdeps/pthread/tst-cond25.c diff --git a/nptl/tst-cond26.c b/sysdeps/pthread/tst-cond26.c similarity index 100% rename from nptl/tst-cond26.c rename to sysdeps/pthread/tst-cond26.c diff --git a/nptl/tst-cond27.c b/sysdeps/pthread/tst-cond27.c similarity index 100% rename from nptl/tst-cond27.c rename to sysdeps/pthread/tst-cond27.c diff --git a/nptl/tst-cond3.c b/sysdeps/pthread/tst-cond3.c similarity index 100% rename from nptl/tst-cond3.c rename to sysdeps/pthread/tst-cond3.c diff --git a/nptl/tst-cond4.c b/sysdeps/pthread/tst-cond4.c similarity index 100% rename from nptl/tst-cond4.c rename to sysdeps/pthread/tst-cond4.c diff --git a/nptl/tst-cond5.c b/sysdeps/pthread/tst-cond5.c similarity index 100% rename from nptl/tst-cond5.c rename to sysdeps/pthread/tst-cond5.c diff --git a/nptl/tst-cond6.c b/sysdeps/pthread/tst-cond6.c similarity index 100% rename from nptl/tst-cond6.c rename to sysdeps/pthread/tst-cond6.c diff --git a/nptl/tst-cond7.c b/sysdeps/pthread/tst-cond7.c similarity index 100% rename from nptl/tst-cond7.c rename to sysdeps/pthread/tst-cond7.c diff --git a/nptl/tst-cond8-static.c b/sysdeps/pthread/tst-cond8-static.c similarity index 100% rename from nptl/tst-cond8-static.c rename to sysdeps/pthread/tst-cond8-static.c diff --git a/nptl/tst-cond8.c b/sysdeps/pthread/tst-cond8.c similarity index 100% rename from nptl/tst-cond8.c rename to sysdeps/pthread/tst-cond8.c diff --git a/nptl/tst-cond9.c b/sysdeps/pthread/tst-cond9.c similarity index 100% rename from nptl/tst-cond9.c rename to sysdeps/pthread/tst-cond9.c