From ae8ffbbb8dde0c7c184270865949af463e769826 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 5 May 2015 11:39:29 +0200 Subject: [PATCH] [PR testsuite/65205, libgomp/65993] Fix dg-shouldfail usage in OpenACC libgomp tests In dg-output, don't expect "0x" prefix for "%p" format specifier, don't expect "(nil)" for NULL pointer. PR testsuite/65205 PR libgomp/65993 libgomp/ * testsuite/libgomp.oacc-c-c++-common/clauses-2.c: In dg-output, don't expect "0x" prefix for "%p" format specifier, don't expect "(nil)" for NULL pointer. * testsuite/libgomp.oacc-c-c++-common/lib-16.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-17.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-18.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-20.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-21.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-22.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-23.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-25.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-26.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-27.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-28.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-29.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-30.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-34.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-35.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-36.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-39.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-40.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-42.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-43.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-44.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-47.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-48.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-52.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-53.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-54.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-57.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/lib-58.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/data-already-1.c: More accurately specify what we're looking for. * testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise. * testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise. * testsuite/libgomp.oacc-fortran/data-already-1.f: Likewise. * testsuite/libgomp.oacc-fortran/data-already-2.f: Likewise. * testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise. From-SVN: r222799 --- libgomp/ChangeLog | 43 +++++++++++++++++++ .../libgomp.oacc-c-c++-common/clauses-2.c | 2 +- .../data-already-1.c | 4 +- .../data-already-2.c | 4 +- .../data-already-8.c | 4 +- .../libgomp.oacc-c-c++-common/lib-16.c | 2 +- .../libgomp.oacc-c-c++-common/lib-17.c | 2 +- .../libgomp.oacc-c-c++-common/lib-18.c | 2 +- .../libgomp.oacc-c-c++-common/lib-20.c | 2 +- .../libgomp.oacc-c-c++-common/lib-21.c | 2 +- .../libgomp.oacc-c-c++-common/lib-22.c | 2 +- .../libgomp.oacc-c-c++-common/lib-23.c | 2 +- .../libgomp.oacc-c-c++-common/lib-25.c | 2 +- .../libgomp.oacc-c-c++-common/lib-26.c | 2 +- .../libgomp.oacc-c-c++-common/lib-27.c | 2 +- .../libgomp.oacc-c-c++-common/lib-28.c | 2 +- .../libgomp.oacc-c-c++-common/lib-29.c | 2 +- .../libgomp.oacc-c-c++-common/lib-30.c | 2 +- .../libgomp.oacc-c-c++-common/lib-34.c | 2 +- .../libgomp.oacc-c-c++-common/lib-35.c | 2 +- .../libgomp.oacc-c-c++-common/lib-36.c | 2 +- .../libgomp.oacc-c-c++-common/lib-39.c | 2 +- .../libgomp.oacc-c-c++-common/lib-40.c | 2 +- .../libgomp.oacc-c-c++-common/lib-42.c | 2 +- .../libgomp.oacc-c-c++-common/lib-43.c | 2 +- .../libgomp.oacc-c-c++-common/lib-44.c | 2 +- .../libgomp.oacc-c-c++-common/lib-47.c | 2 +- .../libgomp.oacc-c-c++-common/lib-48.c | 2 +- .../libgomp.oacc-c-c++-common/lib-52.c | 2 +- .../libgomp.oacc-c-c++-common/lib-53.c | 2 +- .../libgomp.oacc-c-c++-common/lib-54.c | 2 +- .../libgomp.oacc-c-c++-common/lib-57.c | 2 +- .../libgomp.oacc-c-c++-common/lib-58.c | 2 +- .../libgomp.oacc-fortran/data-already-1.f | 2 +- .../libgomp.oacc-fortran/data-already-2.f | 2 +- .../libgomp.oacc-fortran/data-already-8.f | 2 +- 36 files changed, 81 insertions(+), 38 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 1621b90be70..15785ce1601 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,46 @@ +2015-05-05 Thomas Schwinge + + PR testsuite/65205 + PR libgomp/65993 + * testsuite/libgomp.oacc-c-c++-common/clauses-2.c: In dg-output, + don't expect "0x" prefix for "%p" format specifier, don't expect + "(nil)" for NULL pointer. + * testsuite/libgomp.oacc-c-c++-common/lib-16.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-17.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-18.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-20.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-21.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-22.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-23.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-25.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-26.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-27.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-28.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-29.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-30.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-34.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-35.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-36.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-39.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-40.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-42.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-43.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-44.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-47.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-48.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-52.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-53.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-54.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-57.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/lib-58.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/data-already-1.c: More + accurately specify what we're looking for. + * testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise. + * testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise. + * testsuite/libgomp.oacc-fortran/data-already-1.f: Likewise. + * testsuite/libgomp.oacc-fortran/data-already-2.f: Likewise. + * testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise. + 2015-04-30 James Norris PR testsuite/65205 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c index fec2214207b..c0a5d0055b6 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c index 83c0a42c512..0c61a66a0dd 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c index 137d8ce09da..cd9fea33886 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c index a50f7de3a65..7472d7f4e05 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c index ad73bd76452..d6f65595c3e 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c index b568775e52a..d20ad6ab641 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c index 33ebce9b972..a3cb59a0dab 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c index aaab2ecb144..3e86154958a 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c index 5bd90784b38..7fb34e335b6 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c index 638180e6427..b0d4df8a37f 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c index 54dd0f33e9b..64334ecdfbc 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c index 76f191165b7..17f4a19780c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c index cdbc38ed977..41d560eeb1f 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c index 0edec6f848e..9d9d73962d1 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c index 453763d865e..07d13d75f1b 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c index b3326ea0f49..da01194fa41 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c index 3176e24a385..9e340582e63 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c index cbe938f9c31..536e2aef653 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c index 4fe15daf3e0..fc9013630d5 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c index 0fd296a284f..d0587ae4dc6 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c index e8caa38248e..01fdd90ce4f 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c index 0a6607beb88..5a198980a27 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c index cb5a7b24770..ff3eab4ed6e 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c index 2c2220d2a79..45d4988b326 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c index 05d30525e71..abe2b9e17dc 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c index c217bc094ef..2b3730b3289 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c index 1dce1975b96..febe022c75d 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c index 782e26779d0..39845e81171 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c index 7e0a288194b..bed9323141f 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c index fa35a05356a..20fd17501d5 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c index 7e41c4a18f9..69ab79ff4b1 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c index 44353d2dedd..9b1ecd9bf2e 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c +++ b/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 a/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f index ac220ab4c7e..fc08fd5392d 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f +++ b/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 a/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f index 2c5254b8684..b8a82b59502 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f +++ b/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 a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f index 16da048861a..2083809bac8 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f +++ b/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" } -- 2.30.2