Patchwork nptl/tst-cancel25 needs to be an internal test

login
register
mail settings
Submitter Florian Weimer
Date Oct. 18, 2019, 8:27 a.m.
Message ID <874l06wj9e.fsf@oldenburg2.str.redhat.com>
Download mbox | patch
Permalink /patch/35129/
State Committed
Headers show

Comments

Florian Weimer - Oct. 18, 2019, 8:27 a.m.
Otherwise the definition of SIGCANCEL is not visible.

Tested on x86_64-linux-gnu and i686-linux-gnu.

-----
 nptl/Makefile       | 4 ++--
 nptl/tst-cancel25.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
Carlos O'Donell - Oct. 18, 2019, 12:17 p.m.
On 10/18/19 4:27 AM, Florian Weimer wrote:
> Otherwise the definition of SIGCANCEL is not visible.
> 
> Tested on x86_64-linux-gnu and i686-linux-gnu.

This is obvious, please feel free to push such changes in the future.

OK for master.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> -----
>  nptl/Makefile       | 4 ++--
>  nptl/tst-cancel25.c | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 1129fd4516..41f8f5e8d2 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -285,7 +285,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
>  	tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
>  	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
>  	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
> -	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
> +	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \
>  	tst-cancel26 tst-cancel27 \
>  	tst-cancel-self tst-cancel-self-cancelstate \
>  	tst-cancel-self-canceltype tst-cancel-self-testcancel \
> @@ -329,7 +329,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
>  tests-internal := 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-mutexpi8 tst-mutexpi8-static tst-cancel25
>  
>  xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
>  	tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
> diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c
> index 1067634eb7..24ddd3c01c 100644
> --- a/nptl/tst-cancel25.c
> +++ b/nptl/tst-cancel25.c
> @@ -2,6 +2,7 @@
>  #include <signal.h>
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <internal-signals.h>
>  
>  
>  static pthread_barrier_t b;
>
Adhemerval Zanella Netto - Oct. 18, 2019, 12:32 p.m.
On 18/10/2019 05:27, Florian Weimer wrote:
> Otherwise the definition of SIGCANCEL is not visible.

We can also move the implementation detail that checks if pthread_sigmask
does not set SIGCANCEL to an alternate tst-signalX.c.

> 
> Tested on x86_64-linux-gnu and i686-linux-gnu.
> 
> -----
>  nptl/Makefile       | 4 ++--
>  nptl/tst-cancel25.c | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/nptl/Makefile b/nptl/Makefile
> index 1129fd4516..41f8f5e8d2 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -285,7 +285,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
>  	tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
>  	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
>  	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
> -	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
> +	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \
>  	tst-cancel26 tst-cancel27 \
>  	tst-cancel-self tst-cancel-self-cancelstate \
>  	tst-cancel-self-canceltype tst-cancel-self-testcancel \
> @@ -329,7 +329,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
>  tests-internal := 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-mutexpi8 tst-mutexpi8-static tst-cancel25
>  
>  xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
>  	tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
> diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c
> index 1067634eb7..24ddd3c01c 100644
> --- a/nptl/tst-cancel25.c
> +++ b/nptl/tst-cancel25.c
> @@ -2,6 +2,7 @@
>  #include <signal.h>
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <internal-signals.h>
>  
>  
>  static pthread_barrier_t b;
>

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index 1129fd4516..41f8f5e8d2 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -285,7 +285,7 @@  tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 	tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
 	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
 	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
-	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
+	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 \
 	tst-cancel26 tst-cancel27 \
 	tst-cancel-self tst-cancel-self-cancelstate \
 	tst-cancel-self-canceltype tst-cancel-self-testcancel \
@@ -329,7 +329,7 @@  tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 tests-internal := 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-mutexpi8 tst-mutexpi8-static tst-cancel25
 
 xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
 	tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c
index 1067634eb7..24ddd3c01c 100644
--- a/nptl/tst-cancel25.c
+++ b/nptl/tst-cancel25.c
@@ -2,6 +2,7 @@ 
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <internal-signals.h>
 
 
 static pthread_barrier_t b;