diff mbox

[PR,testsuite/65205,libgomp/65993] Fix dg-shouldfail usage in OpenACC libgomp tests

Message ID 87pp6gvj3v.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge May 4, 2015, 8:32 a.m. UTC 
Hi!

On Thu, 30 Apr 2015 14:47:03 +0200, I wrote:
> Here is a patch, prepared by Jim Norris, to fix dg-shouldfail usage in
> OpenACC libgomp tests.  It introduces two regressions (that is, makes the
> existing errors visible), which shall then be fixed later on:
> libgomp.oacc-c-c++-common/lib-3.c, and
> libgomp.oacc-c-c++-common/lib-42.c.
> 
> As obvious, committed to trunk in r222620: [...]

So much for "obvious" ;-) -- <https://gcc.gnu.org/PR65993>.

Dave, would you please test the following patch, and report the
regression status compared to before r222620?  (Compared to your existing
r222021 results, as posted in the PR, for example.)

Additionally to the "%p" format specifier printing a "0x" prefix vs. not
doing that, I've also changed the expected "(nil)" output for NULL
pointers to instead match basically everything.

 libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c      | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c | 4 ++--
 libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c | 4 ++--
 libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c | 4 ++--
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c         | 2 +-
 libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f      | 2 +-
 libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f      | 2 +-
 libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f      | 2 +-
 35 files changed, 38 insertions(+), 38 deletions(-)



Grüße,
 Thomas

Comments

Rainer Orth May 4, 2015, 1:26 p.m. UTC | #1 
Thomas Schwinge <thomas@codesourcery.com> writes:

> Additionally to the "%p" format specifier printing a "0x" prefix vs. not
> doing that, I've also changed the expected "(nil)" output for NULL
> pointers to instead match basically everything.

You cannot expect printf to print "(nil)" or variant for NULL pointers.
E.g. on Solaris 10 you get a SEGV instead.

	Rainer
John David Anglin May 4, 2015, 2:20 p.m. UTC | #2 
On 2015-05-04 4:32 AM, Thomas Schwinge wrote:
> Dave, would you please test the following patch, and report the
> regression status compared to before r222620?  (Compared to your existing
> r222021 results, as posted in the PR, for example.)
With patch, we have the following fails on hppa2.0w-hp-hpux11.11:

FAIL: libgomp.oacc-c/../libgomp.oacc-c-c++-common/lib-3.c 
-DACC_DEVICE_TYPE_host
=1 -DACC_MEM_SHARED=1 output pattern test, is
libgomp: no device found
, should match device [0-9]+\([0-9]+\) is initialized
FAIL: libgomp.oacc-c/../libgomp.oacc-c-c++-common/lib-42.c 
-DACC_DEVICE_TYPE_hos
t=1 -DACC_MEM_SHARED=1 output pattern test, is , should match 
\[[0-9a-fA-FxX]+,2
56\] is not mapped
FAIL: libgomp.oacc-c/../libgomp.oacc-c-c++-common/lib-62.c 
-DACC_DEVICE_TYPE_hos
t=1 -DACC_MEM_SHARED=1 output pattern test, is , should match invalid size
Running /test/gnu/gcc/gcc/libgomp/testsuite/libgomp.oacc-c++/c++.exp ...
FAIL: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/lib-3.c 
-DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 output pattern test, is
libgomp: no device found
, should match device [0-9]+\([0-9]+\) is initialized
FAIL: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/lib-42.c 
-DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 output pattern test, is , 
should match \[[0-9a-fA-FxX]+,256\] is not mapped
FAIL: libgomp.oacc-c++/../libgomp.oacc-c-c++-common/lib-62.c 
-DACC_DEVICE_TYPE_host=1 -DACC_MEM_SHARED=1 output pattern test, is , 
should match invalid size

Note this is a 32-bit build and not the 64-bit build reported in PR.  
However, I would expect similar
printf support.  Don't have a 64-bit build handy.

Dave
Andreas Schwab May 4, 2015, 2:32 p.m. UTC | #3 
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> You cannot expect printf to print "(nil)" or variant for NULL pointers.
> E.g. on Solaris 10 you get a SEGV instead.

You are probably mixing it up with %s.  %p is required to handle NULL
like any other valid pointer value.

Andreas.
Rainer Orth May 4, 2015, 2:38 p.m. UTC | #4 
Andreas Schwab <schwab@linux-m68k.org> writes:

> Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:
>
>> You cannot expect printf to print "(nil)" or variant for NULL pointers.
>> E.g. on Solaris 10 you get a SEGV instead.
>
> You are probably mixing it up with %s.  %p is required to handle NULL
> like any other valid pointer value.

Seems so.  Sorry for the noise.

	Rainer
diff mbox

Patch

diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
index fec2214..c0a5d00 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
@@ -64,5 +64,5 @@  main (int argc, char **argv)
 
     return 0;
 }
-/* { dg-output "Trying to map into device \\\[0x\[0-9a-f\]+..0x\[0-9a-f\]+\\\) object when \\\[0x\[0-9a-f\]+..0x\[0-9a-f\]+\\\) is already mapped" }
+/* { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c
index 83c0a42..0c61a66 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c
@@ -15,5 +15,5 @@  main (int argc, char *argv[])
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "Trying to map into device .* object when .* is already mapped" } */
+/* { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c
index 137d8ce..cd9fea3 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c
@@ -12,5 +12,5 @@  main (int argc, char *argv[])
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "Trying to map into device .* object when .* is already mapped" } */
+/* { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c
index a50f7de..7472d7f 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c
@@ -12,5 +12,5 @@  main (int argc, char *argv[])
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "Trying to map into device .* object when .* is already mapped" } */
+/* { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
index ad73bd7..d6f6559 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
@@ -26,5 +26,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\\\] already mapped to \\\[0x\[0-9a-f\]+,\\\+256\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+256\\\] already mapped to \\\[\[0-9a-fA-FxX\]+,\\\+256\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
index b568775..d20ad6a 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
@@ -28,5 +28,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
index 33ebce9..a3cb59a 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
@@ -31,5 +31,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
index aaab2ec..3e86154 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
@@ -26,5 +26,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2 \\\[0x\[0-9a-f\]+,\\\+257\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] surrounds2 \\\[\[0-9a-fA-FxX\]+,\\\+257\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
index 5bd9078..7fb34e3 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
@@ -26,5 +26,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,0\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,0\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
index 638180e..b0d4df8 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
@@ -26,5 +26,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2 \\\[0x\[0-9a-f\]+,\\\+255\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] surrounds2 \\\[\[0-9a-fA-FxX\]+,\\\+255\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
index 54dd0f3..64334ec 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
@@ -36,5 +36,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2 \\\[0x\[0-9a-f\]+,\\\+512\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] surrounds2 \\\[\[0-9a-fA-FxX\]+,\\\+512\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
index 76f1911..17f4a19 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
@@ -27,5 +27,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\\\] already mapped to \\\[0x\[0-9a-f\]+,\\\+256\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+256\\\] already mapped to \\\[\[0-9a-fA-FxX\]+,\\\+256\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
index cdbc38e..41d560e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+0\\\] is a bad range" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+0\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
index 0edec6f..9d9d739 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),\\\+256\\\] is a bad range" } */
+/* { dg-output "\\\[\[^\n\r]*,\\\+256\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
index 453763d..07d13d7 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),256\\\] is not mapped" } */
+/* { dg-output "\\\[\[^\n\r]*,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
index b3326ea..da01194 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,0\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,0\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
index 3176e24..9e34058 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2 \\\[0x\[0-9a-f\]+,\\\+254\\\]" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] surrounds2 \\\[\[0-9a-fA-FxX\]+,\\\+254\\\]" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
index cbe938f..536e2ae 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
@@ -30,5 +30,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\\\] not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+256\\\] not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
index 4fe15da..fc90136 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),\\\+256\\\] is a bad range" } */
+/* { dg-output "\\\[\[^\n\r]*,\\\+256\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
index 0fd296a..d0587ae 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
@@ -23,5 +23,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+0\\\] is a bad range" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+0\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
index e8caa38..01fdd90 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
@@ -38,5 +38,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),\\\+256\\\] is a bad range" } */
+/* { dg-output "\\\[\[^\n\r]*,\\\+256\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
index 0a6607b..5a19898 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
@@ -39,5 +39,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+0\\\] is a bad range" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+0\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
index cb5a7b2..ff3eab4 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
@@ -32,5 +32,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
index 2c2220d..45d4988 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
@@ -42,5 +42,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),256\\\] is not mapped" } */
+/* { dg-output "\\\[\[^\n\r]*,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
index 05d3052..abe2b9e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
@@ -42,5 +42,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,0\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,0\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
index c217bc0..2b3730b 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
@@ -40,5 +40,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),256\\\] is not mapped" } */
+/* { dg-output "\\\[\[^\n\r]*,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
index 1dce197..febe022 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
@@ -40,5 +40,5 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,0\\\] is not mapped" } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,0\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
index 782e267..39845e8 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
@@ -25,6 +25,6 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[\\\(nil\\\),\\\+256\]->\[0x\[0-9a-f\]+,\\\+256\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
+/* { dg-output "\\\[\[^\n\r]*,\\\+256\]->\[\[0-9a-fA-FxX\]+,\\\+256\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
 /* { dg-output "cannot map data on shared-memory system" { target openacc_host_selected } } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
index 7e0a288..bed9323 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
@@ -25,6 +25,6 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\]->\\\[\\\(nil\\\),\\\+256\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+256\]->\\\[\[^\n\r]*,\\\+256\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
 /* { dg-output "cannot map data on shared-memory system" { target openacc_host_selected } } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
index fa35a05..20fd175 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
@@ -25,6 +25,6 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+0\\\]->\\\[0x\[0-9a-f\]+,\\\+0\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
+/* { dg-output "\\\[\[0-9a-fA-FxX\]+,\\\+0\\\]->\\\[\[0-9a-fA-FxX\]+,\\\+0\\\] is a bad map" { target openacc_nvidia_accel_selected } } */
 /* { dg-output "cannot map data on shared-memory system" { target openacc_host_selected } } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
index 7e41c4a..69ab79f 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
@@ -25,6 +25,6 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "0x\[0-9a-f\]+ is not a mapped block" { target openacc_nvidia_accel_selected } } */
+/* { dg-output "\[0-9a-fA-FxX\]+ is not a mapped block" { target openacc_nvidia_accel_selected } } */
 /* { dg-output "cannot map data on shared-memory system" { target openacc_host_selected } } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
index 44353d2..9b1ecd9 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
@@ -25,6 +25,6 @@  main (int argc, char **argv)
   return 0;
 }
 
-/* { dg-output "\\\(nil\\\) is not a mapped block" { target openacc_nvidia_accel_selected } } */
+/* { dg-output "\[^\n\r]* is not a mapped block" { target openacc_nvidia_accel_selected } } */
 /* { dg-output "cannot map data on shared-memory system" { target openacc_host_selected } } */
 /* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
index ac220ab..fc08fd5 100644
--- libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
+++ libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
@@ -13,5 +13,5 @@ 
 
       END
 
+! { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" }
 ! { dg-shouldfail "" }
-! { dg-output "Trying to map into device .* object when .* is already mapped" }
diff --git libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
index 2c5254b..b8a82b5 100644
--- libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
+++ libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
@@ -12,5 +12,5 @@ 
 
       END
 
+! { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" }
 ! { dg-shouldfail "" }
-! { dg-output "Trying to map into device .* object when .* is already mapped" }
diff --git libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
index 16da048..2083809 100644
--- libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
+++ libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
@@ -12,5 +12,5 @@ 
 
       END
 
+! { dg-output "Trying to map into device \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) object when \\\[\[0-9a-fA-FxX\]+..\[0-9a-fA-FxX\]+\\\) is already mapped" }
 ! { dg-shouldfail "" }
-! { dg-output "Trying to map into device .* object when .* is already mapped" }