[PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448]

[PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448]

[Rainer Orth]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

Two libgomp tests XPASS on Solaris (any non-Linux target actually) since
their introduction:

XPASS: libgomp.c/alloc-pinned-1.c execution test
XPASS: libgomp.c/alloc-pinned-2.c execution test

The problem is that the test just prints

OS unsupported

and exits successfully, while the test is XFAILed:

/* { dg-xfail-run-if "Pinning not implemented on this host" { ! *-*-linux-gnu } } */

Fixed by aborting immediately after the message above in the non-Linux
case.

Tested on i386-pc-solaris2.11 and i686-pc-linux-gnu.

Ok for trunk?

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University


2024-02-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	libgomp:
	PR testsuite/113448
	* testsuite/libgomp.c/alloc-pinned-1.c [!__linux__] (CHECK_SIZE):
	Call abort.
	* testsuite/libgomp.c/alloc-pinned-2.c [!__linux__] (CHECK_SIZE):
	Likewise.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: libgomp-testsuite-alloc-pinned-non-linux.patch --]
[-- Type: text/x-patch, Size: 1203 bytes --]

# HG changeset patch
# Parent  b7015efde7d6a48dd520698b470fcaf824758f21
libgomp: testsuite: Fix libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113085]

diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c
@@ -45,7 +45,10 @@ get_pinned_mem ()
 }
 #else
 #define PAGE_SIZE 1024 /* unknown */
-#define CHECK_SIZE(SIZE) fprintf (stderr, "OS unsupported\n");
+#define CHECK_SIZE(SIZE) { \
+  fprintf (stderr, "OS unsupported\n"); \
+  abort (); \
+  }
 #define EXPECT_OMP_NULL_ALLOCATOR
 
 int
diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
--- a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
+++ b/libgomp/testsuite/libgomp.c/alloc-pinned-2.c
@@ -45,12 +45,16 @@ get_pinned_mem ()
 }
 #else
 #define PAGE_SIZE 1024 /* unknown */
-#define CHECK_SIZE(SIZE) fprintf (stderr, "OS unsupported\n");
+#define CHECK_SIZE(SIZE) { \
+  fprintf (stderr, "OS unsupported\n"); \
+  abort (); \
+  }
 #define EXPECT_OMP_NULL_ALLOCATOR
 
 int
 get_pinned_mem ()
 {
+  abort ();
   return 0;
 }
 #endif

Re: [PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448]

[Andrew Stubbs]

On 05/02/2024 13:04, Rainer Orth wrote:
> Two libgomp tests XPASS on Solaris (any non-Linux target actually) since
> their introduction:
> 
> XPASS: libgomp.c/alloc-pinned-1.c execution test
> XPASS: libgomp.c/alloc-pinned-2.c execution test
> 
> The problem is that the test just prints
> 
> OS unsupported
> 
> and exits successfully, while the test is XFAILed:
> 
> /* { dg-xfail-run-if "Pinning not implemented on this host" { ! *-*-linux-gnu } } */
> 
> Fixed by aborting immediately after the message above in the non-Linux
> case.
> 
> Tested on i386-pc-solaris2.11 and i686-pc-linux-gnu.
> 
> Ok for trunk?

OK with me, FWIW.

Andrew

Re: [PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448]

[Jakub Jelinek]

On Mon, Feb 12, 2024 at 01:30:31PM +0000, Andrew Stubbs wrote:
> On 05/02/2024 13:04, Rainer Orth wrote:
> > Two libgomp tests XPASS on Solaris (any non-Linux target actually) since
> > their introduction:
> > 
> > XPASS: libgomp.c/alloc-pinned-1.c execution test
> > XPASS: libgomp.c/alloc-pinned-2.c execution test
> > 
> > The problem is that the test just prints
> > 
> > OS unsupported
> > 
> > and exits successfully, while the test is XFAILed:
> > 
> > /* { dg-xfail-run-if "Pinning not implemented on this host" { ! *-*-linux-gnu } } */
> > 
> > Fixed by aborting immediately after the message above in the non-Linux
> > case.
> > 
> > Tested on i386-pc-solaris2.11 and i686-pc-linux-gnu.
> > 
> > Ok for trunk?
> 
> OK with me, FWIW.

LGTM as well.

	Jakub