From 1e94648ab7b370c5867e146c7f59603e2e6ba2e6 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 12 Feb 2024 14:44:17 +0100 Subject: [PATCH] libgomp: testsuite: Don't XPASS libgomp.c/alloc-pinned-1.c etc. on non-Linux targets [PR113448] 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. 2024-02-02 Rainer Orth 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. --- libgomp/testsuite/libgomp.c/alloc-pinned-1.c | 5 ++++- libgomp/testsuite/libgomp.c/alloc-pinned-2.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libgomp/testsuite/libgomp.c/alloc-pinned-1.c b/libgomp/testsuite/libgomp.c/alloc-pinned-1.c index e17a21f0a6c0..4185accf2e65 100644 --- 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 index 3cf322cfbc86..0b9c11d03158 100644 --- a/libgomp/testsuite/libgomp.c/alloc-pinned-2.c +++ b/libgomp/testsuite/libgomp.c/alloc-pinned-2.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 -- 2.43.5