Hi! 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:
commit cf9c09c49e63176ff8a1fba429971cb13226260b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu Apr 30 12:44:39 2015 +0000
[PR testsuite/65205] Fix dg-shouldfail usage in OpenACC libgomp tests
PR testsuite/65205
libgomp/
* testsuite/lib/libgomp.exp
(check_effective_target_openacc_host_selected)
(check_effective_target_openacc_host_nonshm_selected): New
procedures.
* testsuite/libgomp.oacc-c-c++-common/clauses-2.c: Fix misuse of
dg-shouldfail.
* testsuite/libgomp.oacc-c-c++-common/lib-1.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-11.c: Likewise.
* 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-2.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-3.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-4.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/lib-62.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-63.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-64.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-65.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-67.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-68.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-71.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-77.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-80.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/present-1.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222620
138bc75d-0d04-0410-961f-82ee72b054a4
---
libgomp/ChangeLog | 53 ++++++++++++++++++++
libgomp/testsuite/lib/libgomp.exp | 20 ++++++++
.../libgomp.oacc-c-c++-common/clauses-2.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-1.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-11.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-16.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-17.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-18.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-2.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-20.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-21.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-22.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-23.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-25.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-26.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-27.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-28.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-29.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-3.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-30.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-34.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-35.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-36.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-39.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-4.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-40.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-42.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-43.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-44.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-47.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-48.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-52.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-53.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-54.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-57.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-58.c | 4 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-62.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-63.c | 5 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-64.c | 5 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-65.c | 5 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-67.c | 5 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-68.c | 5 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-71.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-77.c | 3 +-
.../testsuite/libgomp.oacc-c-c++-common/lib-80.c | 3 +-
.../libgomp.oacc-c-c++-common/present-1.c | 3 +-
46 files changed, 171 insertions(+), 49 deletions(-)
diff --git libgomp/ChangeLog libgomp/ChangeLog
index 4b0a1c9..1621b90 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,3 +1,56 @@
+2015-04-30 James Norris <jnor...@codesourcery.com>
+
+ PR testsuite/65205
+ * testsuite/lib/libgomp.exp
+ (check_effective_target_openacc_host_selected)
+ (check_effective_target_openacc_host_nonshm_selected): New
+ procedures.
+ * testsuite/libgomp.oacc-c-c++-common/clauses-2.c: Fix misuse of
+ dg-shouldfail.
+ * testsuite/libgomp.oacc-c-c++-common/lib-1.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-11.c: Likewise.
+ * 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-2.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-3.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-4.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/lib-62.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-63.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-64.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-65.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-67.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-68.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-71.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-77.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/lib-80.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/present-1.c: Likewise.
+
2015-04-08 Julian Brown <jul...@codesourcery.com>
* libgomp.h (target_mem_desc: Remove mem_map field.
diff --git libgomp/testsuite/lib/libgomp.exp libgomp/testsuite/lib/libgomp.exp
index 5a6eec1..438777f 100644
--- libgomp/testsuite/lib/libgomp.exp
+++ libgomp/testsuite/lib/libgomp.exp
@@ -345,3 +345,23 @@ proc check_effective_target_openacc_nvidia_accel_selected
{ } {
}
return 0;
}
+
+# Return 1 if the host target is selected for offloaded
+
+proc check_effective_target_openacc_host_selected { } {
+ global offload_target_openacc
+ if { $offload_target_openacc == "host" } {
+ return 1;
+ }
+ return 0;
+}
+
+# Return 1 if the host_nonshm target is selected for offloaded
+
+proc check_effective_target_openacc_host_nonshm_selected { } {
+ global offload_target_openacc
+ if { $offload_target_openacc == "host_nonshm" } {
+ return 1;
+ }
+ return 0;
+}
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
index 8dc45cb..fec2214 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
@@ -64,4 +64,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\d+\] is not mapped" } */
+/* { 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-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
index 17129d8..5ff23b2 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
@@ -21,4 +21,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: device already active" } */
+/* { dg-output "device already active" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
index eccdb8c..e34a876e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
@@ -20,4 +20,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: mem free failed 1" } */
+/* { dg-output "invalid device address" } */
+/* { 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 9d277ac..ad73bd7 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
@@ -26,4 +26,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+256\] already mapped to \[\h+,\+256\]" }
*/
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\\\] already mapped to
\\\[0x\[0-9a-f\]+,\\\+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 5ff894c..b568775 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
@@ -28,4 +28,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,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 2bc3263..33ebce9 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
@@ -31,4 +31,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] is not mapped" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
index 9a4501f..b16e9e6 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: no device initialized" } */
+/* { dg-output "no device initialized" } */
+/* { 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 b379a8f..aaab2ec 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
@@ -26,4 +26,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] surounds2 \[\h+,\+257\]" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2
\\\[0x\[0-9a-f\]+,\\\+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 3a67400..5bd9078 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
@@ -26,4 +26,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,0\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,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 2b86da8..638180e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
@@ -26,4 +26,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] surrounds2 \[\h+,\+255\]" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2
\\\[0x\[0-9a-f\]+,\\\+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 38f236d..54dd0f3 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
@@ -36,4 +36,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] surrounds2 \[\h+,\+512\]" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2
\\\[0x\[0-9a-f\]+,\\\+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 1145828..76f1911 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
@@ -27,4 +27,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] already mapped to \[\h+,256\]" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\\\] already mapped to
\\\[0x\[0-9a-f\]+,\\\+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 a23f56e..cdbc38e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+0\] is a bad range" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+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 074fddb..0edec6f 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\)\] is a bad range" } */
+/* { dg-output "\\\[\\\(nil\\\),\\\+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 027f7cc..453763d 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\),256\] is not mapped" } */
+/* { dg-output "\\\[\\\(nil\\\),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 a66de0f..b3326ea 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,0\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,0\\\] is not mapped" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
index e823a41..bb76c82 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
@@ -12,4 +12,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: device 4(4) is initialized" } */
+/* { dg-output "device \[0-9\]+\\\(\[0-9\]+\\\) is initialized" } */
+/* { 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 ce2bdb4..3176e24 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] surrounds2 \[\h+,\+254\]" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,256\\\] surrounds2
\\\[0x\[0-9a-f\]+,\\\+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 32d5d51..cbe938f 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
@@ -30,4 +30,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+256\] not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+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 ca8edab..4fe15da 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\),+256\] is a bad range" } */
+/* { dg-output "\\\[\\\(nil\\\),\\\+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 cb29397..0fd296a 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
@@ -23,4 +23,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+0\] is a bad range" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+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 db1e0b3..e8caa38 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
@@ -38,4 +38,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\),+256\] is a bad range" } */
+/* { dg-output "\\\[\\\(nil\\\),\\\+256\\\] is a bad range" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
index 060275b..35f9440 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
@@ -10,4 +10,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: device 99 is out of range" } */
+/* { dg-output "device \[0-9\]+ out of 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 cb6c422..0a6607b 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
@@ -39,4 +39,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+0\] is a bad range" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+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 d577fe3..cb5a7b2 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
@@ -32,4 +32,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,256\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,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 ceeb155..2c2220d 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
@@ -42,4 +42,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\),256\] is not mapped" } */
+/* { dg-output "\\\[\\\(nil\\\),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 0cabb0d..05d3052 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
@@ -42,4 +42,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,0\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,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 a7ff904..c217bc0 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\(nil\),256\] is not mapped" } */
+/* { dg-output "\\\[\\\(nil\\\),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 01d3c6c..1dce197 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,0\] is not mapped" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,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 780db31..782e267 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
@@ -25,4 +25,6 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[(nil),+256\]->\[\h+,\+256\] is a bad map" } */
+/* { dg-output "\\\[\\\(nil\\\),\\\+256\]->\[0x\[0-9a-f\]+,\\\+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 657adde..7e0a288 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
@@ -25,4 +25,6 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+256\]->\[(nil),\+256\] is a bad map" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+256\]->\\\[\\\(nil\\\),\\\+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 1f3df80..fa35a05 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
@@ -25,4 +25,6 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \[\h+,\+0\]->\[\h+,\+0\] is a bad map" } */
+/* { dg-output "\\\[0x\[0-9a-f\]+,\\\+0\\\]->\\\[0x\[0-9a-f\]+,\\\+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 f9043a4..7e41c4a 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
@@ -25,4 +25,6 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \h+ is not a mapped block" } */
+/* { dg-output "0x\[0-9a-f\]+ 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 9d6e27d..44353d2 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
@@ -25,4 +25,6 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: \(nil\) is not a mapped block" } */
+/* { dg-output "\\\(nil\\\) 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-62.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
index e6178e2..47dc953 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
@@ -46,4 +46,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid size" } */
+/* { dg-output "invalid size" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
index ca237ec..69c061e 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <string.h>
#include <stdlib.h>
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid device address" } */
+/* { dg-output "invalid device address" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
index 850fd2e..6a785b0 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <string.h>
#include <stdlib.h>
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid host address" } */
+/* { dg-output "invalid host address" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
index 26c8cef..0f2f9eb 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <string.h>
#include <stdlib.h>
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid host or device address" } */
+/* { dg-output "invalid host or device address" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
index 01b8b2d..31b8c1f 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <string.h>
#include <stdlib.h>
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid host address" } */
+/* { dg-output "invalid host address" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
index 3ff5bd7..dc39770 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
@@ -1,4 +1,4 @@
-/* { dg-do run } */
+/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <string.h>
#include <stdlib.h>
@@ -40,4 +40,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: invalid device address" } */
+/* { dg-output "invalid device address" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
index a045379..e8584db 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
@@ -116,4 +116,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: unknown async \d" } */
+/* { dg-output "unknown async \[0-9\]+" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
index e47212b..35a0980 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
@@ -132,4 +132,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: unknown async \d" } */
+/* { dg-output "unknown async \[0-9\]+" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
index 0b5ec24..d521331 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
@@ -129,4 +129,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: identical parameters" } */
+/* { dg-output "identical parameters" } */
+/* { dg-shouldfail "" } */
diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
index f331f1f..d8fcb71 100644
--- libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
+++ libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
@@ -45,4 +45,5 @@ main (int argc, char **argv)
return 0;
}
-/* { dg-shouldfail "libgomp: present clause: !acc_is_present" } */
+/* { dg-output "present clause: !acc_is_present" } */
+/* { dg-shouldfail "" } */
Grüße,
Thomas
pgp1QMX1oicuN.pgp
Description: PGP signature
