From 4e2a5450e9eb72202262f7407be4afab19556f9e Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed, 30 Sep 2015 10:44:49 +0200
Subject: [PATCH] Add checkpoint to libgomp dg-shouldfail tests

That is, verify that we're actually reaching the expected checkpoint before
terminating.

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/abort-1.c: Add checkpoint.
	* testsuite/libgomp.oacc-c-c++-common/abort-3.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/clauses-2.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-1.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-3.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-4.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-5.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-6.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-7.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise.
	* 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.
	* testsuite/libgomp.oacc-fortran/abort-1.f90: 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-3.f: Likewise.
	* testsuite/libgomp.oacc-fortran/data-already-4.f: Likewise.
	* testsuite/libgomp.oacc-fortran/data-already-5.f: Likewise.
	* testsuite/libgomp.oacc-fortran/data-already-6.f: Likewise.
	* testsuite/libgomp.oacc-fortran/data-already-7.f: Likewise.
	* testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise.

From-SVN: r228282
---
 libgomp/ChangeLog                             | 66 +++++++++++++++++++
 .../libgomp.oacc-c-c++-common/abort-1.c       |  5 +-
 .../libgomp.oacc-c-c++-common/abort-3.c       |  5 +-
 .../libgomp.oacc-c-c++-common/clauses-2.c     |  3 +
 .../data-already-1.c                          |  3 +
 .../data-already-2.c                          |  8 ++-
 .../data-already-3.c                          | 11 +++-
 .../data-already-4.c                          |  7 +-
 .../data-already-5.c                          |  7 +-
 .../data-already-6.c                          |  7 +-
 .../data-already-7.c                          |  7 +-
 .../data-already-8.c                          |  8 ++-
 .../libgomp.oacc-c-c++-common/lib-1.c         |  3 +
 .../libgomp.oacc-c-c++-common/lib-11.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-16.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-17.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-18.c        |  5 +-
 .../libgomp.oacc-c-c++-common/lib-2.c         |  3 +
 .../libgomp.oacc-c-c++-common/lib-20.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-21.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-22.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-23.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-25.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-26.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-27.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-28.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-29.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-3.c         |  3 +
 .../libgomp.oacc-c-c++-common/lib-30.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-34.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-35.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-36.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-39.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-4.c         |  3 +
 .../libgomp.oacc-c-c++-common/lib-40.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-42.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-43.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-44.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-47.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-48.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-52.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-53.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-54.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-57.c        |  8 +++
 .../libgomp.oacc-c-c++-common/lib-58.c        |  8 +++
 .../libgomp.oacc-c-c++-common/lib-62.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-63.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-64.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-65.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-67.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-68.c        |  3 +
 .../libgomp.oacc-c-c++-common/lib-71.c        |  2 +
 .../libgomp.oacc-c-c++-common/lib-77.c        |  2 +
 .../libgomp.oacc-c-c++-common/lib-80.c        |  2 +
 .../libgomp.oacc-c-c++-common/present-1.c     |  3 +
 .../libgomp.oacc-fortran/abort-1.f90          |  6 +-
 .../libgomp.oacc-fortran/data-already-1.f     |  3 +-
 .../libgomp.oacc-fortran/data-already-2.f     |  2 +
 .../libgomp.oacc-fortran/data-already-3.f     |  4 +-
 .../libgomp.oacc-fortran/data-already-4.f     |  4 +-
 .../libgomp.oacc-fortran/data-already-5.f     |  4 +-
 .../libgomp.oacc-fortran/data-already-6.f     |  4 +-
 .../libgomp.oacc-fortran/data-already-7.f     |  4 +-
 .../libgomp.oacc-fortran/data-already-8.f     |  2 +
 64 files changed, 281 insertions(+), 27 deletions(-)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 8fbd6c59dee..fcf80e26e99 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,69 @@
+2015-09-30  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* testsuite/libgomp.oacc-c-c++-common/abort-1.c: Add checkpoint.
+	* testsuite/libgomp.oacc-c-c++-common/abort-3.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/clauses-2.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-1.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-3.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-4.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-5.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-6.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-7.c: Likewise.
+	* testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise.
+	* 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.
+	* testsuite/libgomp.oacc-fortran/abort-1.f90: 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-3.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/data-already-4.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/data-already-5.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/data-already-6.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/data-already-7.f: Likewise.
+	* testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise.
+
 2015-09-29  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* oacc-init.c (acc_on_device): Force optimization level.
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-1.c
index f88b9e3c7f5..6a9b1df0fa6 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-1.c
@@ -1,12 +1,11 @@
 /* { dg-do run } */
-/* { dg-shouldfail "" { *-*-* } { "*" } { "" } } */
 
 #include <stdlib.h>
 
 int
 main (void)
 {
-
+  __builtin_printf ("CheCKpOInT\n");
 #pragma acc parallel
   {
     abort ();
@@ -15,3 +14,5 @@ main (void)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT" } */
+/* { dg-shouldfail ""  } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-3.c
index be7aaa86551..2c8f347ed01 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/abort-3.c
@@ -1,12 +1,11 @@
 /* { dg-do run } */
-/* { dg-shouldfail "" { *-*-* } { "*" } { "" } } */
 
 #include <stdlib.h>
 
 int
 main (void)
 {
-
+  __builtin_printf ("CheCKpOInT\n");
 #pragma acc kernels
   {
     abort ();
@@ -15,3 +14,5 @@ main (void)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT" } */
+/* { dg-shouldfail ""  } */
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 c0a5d0055b6..ff237fe25e9 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/clauses-2.c
@@ -27,6 +27,7 @@ main (int argc, char **argv)
     d = (float *) acc_malloc (N * sizeof (float));
     acc_map_data (c, d, N * sizeof (float));
 
+    fprintf (stderr, "CheCKpOInT\n");
 #pragma acc parallel copyin (a[0:N]) present_or_create (c[0:N+1]) copyout (b[0:N])
     {
         int ii;
@@ -64,5 +65,7 @@ main (int argc, char **argv)
 
     return 0;
 }
+
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 0c61a66a0dd..0ed53a41a96 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
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -9,11 +10,13 @@ main (int argc, char *argv[])
 
   acc_copyin (&i, sizeof i);
 
+  fprintf (stderr, "CheCKpOInT\n");
 #pragma acc data copy (i)
   ++i;
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 cd9fea33886..00adf2a2bf4 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
@@ -1,16 +1,22 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
+
 int
 main (int argc, char *argv[])
 {
   int i;
 
 #pragma acc data present_or_copy (i)
+  {
+    fprintf (stderr, "CheCKpOInT\n");
 #pragma acc data copyout (i)
-  ++i;
+    ++i;
+  }
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c
index b993b78c5ac..04073e323d9 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -8,10 +9,14 @@ main (int argc, char *argv[])
   int i;
 
 #pragma acc data present_or_copy (i)
-  acc_copyin (&i, sizeof i);
+  {
+    fprintf (stderr, "CheCKpOInT\n");
+    acc_copyin (&i, sizeof i);
+  }
 
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "already mapped to" } */
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
+/* { dg-output "already mapped to" } */
+/* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c
index 82523f42f1a..cfa5cb2c44a 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -8,10 +9,12 @@ main (int argc, char *argv[])
   int i;
 
   acc_present_or_copyin (&i, sizeof i);
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyin (&i, sizeof i);
 
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "already mapped to" } */
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
+/* { dg-output "already mapped to" } */
+/* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c
index 4961fe54406..e15c3fb1aaa 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -8,10 +9,12 @@ main (int argc, char *argv[])
   int i;
 
 #pragma acc enter data create (i)
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyin (&i, sizeof i);
 
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "already mapped to" } */
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
+/* { dg-output "already mapped to" } */
+/* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c
index 77b56a93281..4570c74965c 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -8,10 +9,12 @@ main (int argc, char *argv[])
   int i;
 
   acc_present_or_copyin (&i, sizeof i);
+  fprintf (stderr, "CheCKpOInT\n");
 #pragma acc enter data create (i)
 
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "already mapped to" } */
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
+/* { dg-output "already mapped to" } */
+/* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c
index b08417bd6ac..467cf39aa5d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c
@@ -1,5 +1,6 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -8,10 +9,12 @@ main (int argc, char *argv[])
   int i;
 
 #pragma acc enter data create (i)
+  fprintf (stderr, "CheCKpOInT\n");
   acc_create (&i, sizeof i);
 
   return 0;
 }
 
-/* { dg-shouldfail "" }
-   { dg-output "already mapped to" } */
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
+/* { dg-output "already mapped to" } */
+/* { 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 7472d7f4e05..f41431c1418 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
@@ -1,16 +1,22 @@
 /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
 
+#include <stdio.h>
+
 int
 main (int argc, char *argv[])
 {
   int i;
 
 #pragma acc data create (i)
+  {
+    fprintf (stderr, "CheCKpOInT\n");
 #pragma acc parallel copyin (i)
-  ++i;
+    ++i;
+  }
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
index 5ff23b24190..26318f1cca4 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -16,10 +17,12 @@ main (int argc, char **argv)
 
   acc_init (devtype);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_init (devtype);
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "device already active" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
index e34a876e0d0..86cfeb68c5d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-11.c
@@ -1,6 +1,7 @@
 /* Only nvptx plugin does the required error checking.
    { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 #include <stdint.h>
@@ -15,10 +16,12 @@ main (int argc, char **argv)
   if (d == NULL)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_free ((void *)((uintptr_t) d + (uintptr_t) (N >> 1)));
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid device address" } */
 /* { 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 d6f65595c3e..28e4e5c65fa 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-16.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -19,6 +20,7 @@ main (int argc, char **argv)
 
   (void) acc_copyin (h, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   (void) acc_copyin (h, N);
 
   free (h);
@@ -26,5 +28,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 d20ad6ab641..7d1767e3787 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-17.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -21,6 +22,7 @@ main (int argc, char **argv)
 
   acc_copyout (h, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h, N);
 
   free (h);
@@ -28,5 +30,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 a3cb59a0dab..160b33c90d8 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-18.c
@@ -1,10 +1,9 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
-#include <stdio.h>
-
 int
 main (int argc, char **argv)
 {
@@ -24,6 +23,7 @@ main (int argc, char **argv)
 
   acc_free (d);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h, N);
 
   free (h);
@@ -31,5 +31,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
index b16e9e6bdbc..c658dd66861 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -18,10 +19,12 @@ main (int argc, char **argv)
 
   acc_shutdown (devtype);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_shutdown (devtype);
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "no device initialized" } */
 /* { 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 3e86154958a..4f8e14c2218 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-20.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -19,6 +20,7 @@ main (int argc, char **argv)
 
   (void) acc_copyin (h, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h, N + 1);
 
   free (h);
@@ -26,5 +28,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 7fb34e335b6..d9087008290 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-21.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -19,6 +20,7 @@ main (int argc, char **argv)
 
   (void) acc_copyin (h, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h, 0);
 
   free (h);
@@ -26,5 +28,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 b0d4df8a37f..a6c0197b1ab 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-22.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -19,6 +20,7 @@ main (int argc, char **argv)
 
   (void) acc_copyin (h, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h + 1, N - 1);
 
   free (h);
@@ -26,5 +28,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 64334ecdfbc..2339dd6fa25 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-23.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -28,6 +29,7 @@ main (int argc, char **argv)
 
   (void) acc_copyin (h2, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_copyout (h1, N + N);
 
   free (h1);
@@ -36,5 +38,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 17f4a19780c..bb709d3d607 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-25.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -16,6 +17,7 @@ main (int argc, char **argv)
   if (!d)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_create (h, N);
   if (!d)
     abort ();
@@ -27,5 +29,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 41d560eeb1f..8e1a911abd2 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-26.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -12,6 +13,7 @@ main (int argc, char **argv)
 
   h = (unsigned char *) malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_create (h, 0);
   if (!d)
     abort ();
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 9d9d73962d1..c61f62e9f1f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-27.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -12,6 +13,7 @@ main (int argc, char **argv)
 
   h = (unsigned char *) malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_create (0, N);
   if (!d)
     abort ();
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 07d13d75f1b..9304daa9f3f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-28.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -16,6 +17,7 @@ main (int argc, char **argv)
   if (!d)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_delete (0, N);
 
   free (h);
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 da01194fa41..92e38587f2d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-29.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -16,6 +17,7 @@ main (int argc, char **argv)
   if (!d)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_delete (h, 0);
 
   free (h);
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "\\\[\[0-9a-fA-FxX\]+,0\\\] is not mapped" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
index d5f390d7f9d..7118797a84f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-3.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
@@ -7,11 +8,13 @@ main (int argc, char **argv)
 {
   acc_init (acc_device_host);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_shutdown (acc_device_not_host);
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* TODO: currently prints: "libgomp: no device found".  */
 /* { dg-output "device \[0-9\]+\\\(\[0-9\]+\\\) is initialized" { xfail *-*-* } } */
 /* { 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 9e340582e63..e81627da5c1 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-30.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -16,6 +17,7 @@ main (int argc, char **argv)
   if (!d)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_delete (h, N - 2);
 
   free (h);
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 536e2aef653..031c7318e68 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-34.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -16,6 +17,7 @@ main (int argc, char **argv)
   if (!d1)
     abort ();
 
+  fprintf (stderr, "CheCKpOInT\n");
   d2 = acc_present_or_create (h + 2, N);
   if (!d2)
     abort ();
@@ -30,5 +32,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 fc9013630d5..5e0a0e9bec2 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-35.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -12,6 +13,7 @@ main (int argc, char **argv)
 
   h = (unsigned char *) malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_present_or_create (0, N);
   if (!d)
     abort ();
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 d0587ae4dc6..8ff61c76491 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-36.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -12,6 +13,7 @@ main (int argc, char **argv)
 
   h = (unsigned char *) malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_present_or_create (h, 0);
   if (!d)
     abort ();
@@ -23,5 +25,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 01fdd90ce4f..39fc15a32db 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-39.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -19,6 +20,7 @@ main (int argc, char **argv)
       h[i] = i;
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_present_or_copyin (0, N);
   if (!d)
     abort ();
@@ -38,5 +40,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "\\\[\[^\n\r]*,\\\+256\\\] is a bad range" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
index 3bb9ea512b6..452ed29f0fd 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-4.c
@@ -1,14 +1,17 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <openacc.h>
 
 int
 main (int argc, char **argv)
 {
+  fprintf (stderr, "CheCKpOInT\n");
   acc_init ((acc_device_t) 99);
 
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "unknown device type \[0-9\]+" } */
 /* { 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 5a198980a27..f4ab6d8fc3e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-40.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -20,6 +21,7 @@ main (int argc, char **argv)
       h[i] = i;
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   d = acc_present_or_copyin (h, 0);
   if (!d)
     abort ();
@@ -39,5 +41,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 b74adddccac..95c41625466 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-42.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -17,6 +18,7 @@ main (int argc, char **argv)
       h[i] = i;
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_update_device (h, N);
 
   acc_copyout (h, N);
@@ -32,6 +34,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* TODO: currently doesn't print anything; SIGSEGV.
    <https://gcc.gnu.org/PR66518>.  */
 /* { dg-output "\\\[\[0-9a-fA-FxX\]+,256\\\] is not mapped" { xfail *-*-* } } */
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 45d4988b326..0d593f05671 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-43.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -27,6 +28,7 @@ main (int argc, char **argv)
       h[i] = 0xab;
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_update_device (0, N);
 
   acc_copyout (h, N);
@@ -42,5 +44,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 abe2b9e17dc..e98ecc42794 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-44.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -27,6 +28,7 @@ main (int argc, char **argv)
       h[i] = 0xab;
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_update_device (h, 0);
 
   acc_copyout (h, N);
@@ -42,5 +44,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 2b3730b3289..f26fc3318f6 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-47.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -25,6 +26,7 @@ main (int argc, char **argv)
 
   memset (&h[0], 0, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_update_self (0, N);
 
   for (i = 0; i < N; i++)
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 febe022c75d..253ce59cefa 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-48.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -25,6 +26,7 @@ main (int argc, char **argv)
 
   memset (&h[0], 0, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_update_self (h, 0);
 
   for (i = 0; i < N; i++)
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 39845e81171..cfbb0774532 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-52.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -14,6 +15,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_map_data (0, d, N);
 
   acc_unmap_data (h);
@@ -25,6 +27,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 bed9323141f..5de376d0328 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-53.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -14,6 +15,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_map_data (h, 0, N);
 
   acc_unmap_data (h);
@@ -25,6 +27,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 20fd17501d5..3e621c3c058 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-54.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -14,6 +15,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_map_data (h, d, 0);
 
   acc_unmap_data (h);
@@ -25,6 +27,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 69ab79ff4b1..971a0147f3d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-57.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -14,8 +15,14 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+#if ACC_MEM_SHARED
+  fprintf (stderr, "CheCKpOInT\n");
+#endif
   acc_map_data (h, d, N);
 
+#if !ACC_MEM_SHARED
+  fprintf (stderr, "CheCKpOInT\n");
+#endif
   acc_unmap_data (d);
 
   acc_free (d);
@@ -25,6 +32,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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 9b1ecd9bf2e..fedda77004b 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-58.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <openacc.h>
 
@@ -14,8 +15,14 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+#if ACC_MEM_SHARED
+  fprintf (stderr, "CheCKpOInT\n");
+#endif
   acc_map_data (h, d, N);
 
+#if !ACC_MEM_SHARED
+  fprintf (stderr, "CheCKpOInT\n");
+#endif
   acc_unmap_data (0);
 
   acc_free (d);
@@ -25,6 +32,7 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { 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-c-c++-common/lib-62.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
index 2988b5bcd0a..ace4b058b9b 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-62.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -25,6 +26,7 @@ main (int argc, char **argv)
 
   memset (&h[0], 0, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_to_device (d, h, N << 1);
 
   acc_memcpy_from_device (h, d, N);
@@ -42,5 +44,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid size" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
index 69c061e3a90..a3fa728510f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-63.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -21,6 +22,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_to_device (0, h, N);
 
   memset (&h[0], 0, N);
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid device address" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
index 6a785b03947..b57f67a0058 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-64.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -21,6 +22,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_to_device (d, 0, N);
 
   memset (&h[0], 0, N);
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid host address" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
index 0f2f9ebe4fd..0fca8214e76 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-65.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -21,6 +22,7 @@ main (int argc, char **argv)
 
   d = acc_malloc (N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_to_device (d, d, N);
 
   memset (&h[0], 0, N);
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid host or device address" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
index 31b8c1fe5e6..ec3c2a53baf 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-67.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -25,6 +26,7 @@ main (int argc, char **argv)
 
   memset (&h[0], 0, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_from_device (0, d, N);
 
   for (i = 0; i < N; i++)
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid host address" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
index dc39770aece..f10903443d8 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-68.c
@@ -1,5 +1,6 @@
 /* { dg-do run { target openacc_nvidia_accel_selected } } */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openacc.h>
@@ -25,6 +26,7 @@ main (int argc, char **argv)
 
   memset (&h[0], 0, N);
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_memcpy_from_device (h, 0, N);
 
   for (i = 0; i < N; i++)
@@ -40,5 +42,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "invalid device address" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
index e8584db27cf..c85e8245955 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-71.c
@@ -92,6 +92,7 @@ main (int argc, char **argv)
       abort ();
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   if (acc_async_test (1) != 0)
     {
       fprintf (stderr, "asynchronous operation not running\n");
@@ -116,5 +117,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "unknown async \[0-9\]+" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
index 35a09801cbe..f4f196def3b 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-77.c
@@ -98,6 +98,7 @@ main (int argc, char **argv)
       abort ();
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_wait (1);
 
   atime = stop_timer (0);
@@ -132,5 +133,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "unknown async \[0-9\]+" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
index d521331210d..9a9a837fa4f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-80.c
@@ -105,6 +105,7 @@ main (int argc, char **argv)
 	}
     }
 
+  fprintf (stderr, "CheCKpOInT\n");
   acc_wait_async (1, 1);
 
   acc_wait (1);
@@ -129,5 +130,6 @@ main (int argc, char **argv)
   return 0;
 }
 
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "identical parameters" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
index d8fcb716b9b..61c8109a7e0 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/present-1.c
@@ -21,6 +21,7 @@ main (int argc, char **argv)
     d = (float *) acc_malloc (N * sizeof (float));
     acc_map_data (c, d, N * sizeof (float));
 
+    fprintf (stderr, "CheCKpOInT\n");
 #pragma acc data present (a[0:N]) present (c[0:N]) present (b[0:N])
     {
 #pragma acc parallel
@@ -45,5 +46,7 @@ main (int argc, char **argv)
 
     return 0;
 }
+
+/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
 /* { dg-output "present clause: !acc_is_present" } */
 /* { dg-shouldfail "" } */
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
index 52b030bb6ce..b38303d015a 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
+++ b/libgomp/testsuite/libgomp.oacc-fortran/abort-1.f90
@@ -1,10 +1,12 @@
-! { dg-shouldfail "" { *-*-* } { "*" } { "" } }
-
 program main
   implicit none
 
+  print *, "CheCKpOInT"
   !$acc parallel
   call abort
   !$acc end parallel
 
 end program main
+
+! { dg-output "CheCKpOInT" }
+! { 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 fc08fd5392d..9e99cc60be5 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
@@ -6,12 +6,13 @@
       INTEGER I
 
       CALL ACC_COPYIN (I)
-
+      WRITE(0, *) "CheCKpOInT"
 !$ACC DATA COPY (I)
       I = 0
 !$ACC END DATA
 
       END
 
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { 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-fortran/data-already-2.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
index b8a82b59502..b908a0c0702 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
@@ -5,6 +5,7 @@
       INTEGER I
 
 !$ACC DATA PRESENT_OR_COPY (I)
+      WRITE(0, *) "CheCKpOInT"
 !$ACC DATA COPYOUT (I)
       I = 0
 !$ACC END DATA
@@ -12,5 +13,6 @@
 
       END
 
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { 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-fortran/data-already-3.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f
index c41de28f539..d93e1c5cedd 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f
@@ -6,10 +6,12 @@
       INTEGER I
 
 !$ACC DATA PRESENT_OR_COPY (I)
+      WRITE(0, *) "CheCKpOInT"
       CALL ACC_COPYIN (I)
 !$ACC END DATA
 
       END
 
-! { dg-shouldfail "" }
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { dg-output "already mapped to" }
+! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f
index f54bf580ce9..ea76e058d9c 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f
@@ -6,9 +6,11 @@
       INTEGER I
 
       CALL ACC_PRESENT_OR_COPYIN (I)
+      WRITE(0, *) "CheCKpOInT"
       CALL ACC_COPYIN (I)
 
       END
 
-! { dg-shouldfail "" }
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { dg-output "already mapped to" }
+! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f
index 9a3e94fac7a..19df1f8bde2 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f
@@ -6,9 +6,11 @@
       INTEGER I
 
 !$ACC ENTER DATA CREATE (I)
+      WRITE(0, *) "CheCKpOInT"
       CALL ACC_COPYIN (I)
 
       END
 
-! { dg-shouldfail "" }
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { dg-output "already mapped to" }
+! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f
index eaf5d982492..2bd1079087d 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f
@@ -6,9 +6,11 @@
       INTEGER I
 
       CALL ACC_PRESENT_OR_COPYIN (I)
+      WRITE(0, *) "CheCKpOInT"
 !$ACC ENTER DATA CREATE (I)
 
       END
 
-! { dg-shouldfail "" }
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { dg-output "already mapped to" }
+! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f
index d96bf0b2f84..1342360f53a 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f
@@ -6,9 +6,11 @@
       INTEGER I
 
 !$ACC ENTER DATA CREATE (I)
+      WRITE(0, *) "CheCKpOInT"
       CALL ACC_CREATE (I)
 
       END
 
-! { dg-shouldfail "" }
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { dg-output "already mapped to" }
+! { dg-shouldfail "" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
index 2083809bac8..b206547bca7 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
+++ b/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
@@ -5,6 +5,7 @@
       INTEGER I
 
 !$ACC DATA CREATE (I)
+      WRITE(0, *) "CheCKpOInT"
 !$ACC PARALLEL COPYIN (I)
       I = 0
 !$ACC END PARALLEL
@@ -12,5 +13,6 @@
 
       END
 
+! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
 ! { 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 "" }
-- 
2.30.2