From 01509e2f045ab897000de7a2b242a059a99a89a3 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <tobias@codesourcery.com>
Date: Wed, 30 Oct 2019 10:33:58 +0000
Subject: [PATCH] =?utf8?q?libgomp/testsuite=20=E2=80=93=20use=20'stop'=20a?=
 =?utf8?q?nd=20'dg-do=20run'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

        libgomp/
        * testsuite/libgomp.fortran/target-simd.f90: Use stop not abort.
        * testsuite/libgomp.fortran/use_device_ptr-optional-1.f90:
        Ditto; add 'dg-do run' for torture testing.
        * testsuite/libgomp.fortran/lastprivate1.f90:  Add 'dg-do run'.
        * testsuite/libgomp.fortran/lastprivate2.f90: Ditto.
        * testsuite/libgomp.fortran/nestedfn4.f90: Ditto.
        * testsuite/libgomp.fortran/pr25219.f90: Ditto.
        * testsuite/libgomp.fortran/pr28390.f: Ditto.
        * testsuite/libgomp.fortran/pr35130.f90: Ditto.
        * testsuite/libgomp.fortran/pr90779.f90: Ditto.
        * testsuite/libgomp.fortran/task2.f90: Ditto.
        * testsuite/libgomp.fortran/taskgroup1.f90: Ditto.
        * testsuite/libgomp.fortran/taskloop1.f90: Ditto.
        * testsuite/libgomp.fortran/use_device_addr-1.f90: Ditto.
        * testsuite/libgomp.fortran/use_device_addr-2.f90: Ditto.
        * testsuite/libgomp.fortran/workshare1.f90: Ditto.
        * testsuite/libgomp.fortran/workshare2.f90: Ditto.

From-SVN: r277606
---
 libgomp/ChangeLog                             | 20 +++++++++++++++++++
 .../libgomp.fortran/lastprivate1.f90          |  1 +
 .../libgomp.fortran/lastprivate2.f90          |  1 +
 .../testsuite/libgomp.fortran/nestedfn4.f90   |  1 +
 libgomp/testsuite/libgomp.fortran/pr25219.f90 |  1 +
 libgomp/testsuite/libgomp.fortran/pr28390.f   |  1 +
 libgomp/testsuite/libgomp.fortran/pr35130.f90 |  1 +
 libgomp/testsuite/libgomp.fortran/pr90779.f90 |  1 +
 .../testsuite/libgomp.fortran/target-simd.f90 |  4 ++--
 libgomp/testsuite/libgomp.fortran/task2.f90   |  1 +
 .../testsuite/libgomp.fortran/taskgroup1.f90  |  1 +
 .../testsuite/libgomp.fortran/taskloop1.f90   |  1 +
 .../libgomp.fortran/use_device_addr-1.f90     |  1 +
 .../libgomp.fortran/use_device_addr-2.f90     |  1 +
 .../use_device_ptr-optional-1.f90             | 17 ++++++++--------
 .../testsuite/libgomp.fortran/workshare1.f90  |  1 +
 .../testsuite/libgomp.fortran/workshare2.f90  |  1 +
 17 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index aa30b809f15..bd16e9c9074 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,23 @@
+2019-10-30  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.fortran/target-simd.f90: Use stop not abort.
+	* testsuite/libgomp.fortran/use_device_ptr-optional-1.f90:
+	Ditto; add 'dg-do run' for torture testing.
+	* testsuite/libgomp.fortran/lastprivate1.f90:  Add 'dg-do run'.
+	* testsuite/libgomp.fortran/lastprivate2.f90: Ditto.
+	* testsuite/libgomp.fortran/nestedfn4.f90: Ditto.
+	* testsuite/libgomp.fortran/pr25219.f90: Ditto.
+	* testsuite/libgomp.fortran/pr28390.f: Ditto.
+	* testsuite/libgomp.fortran/pr35130.f90: Ditto.
+	* testsuite/libgomp.fortran/pr90779.f90: Ditto.
+	* testsuite/libgomp.fortran/task2.f90: Ditto.
+	* testsuite/libgomp.fortran/taskgroup1.f90: Ditto.
+	* testsuite/libgomp.fortran/taskloop1.f90: Ditto.
+	* testsuite/libgomp.fortran/use_device_addr-1.f90: Ditto.
+	* testsuite/libgomp.fortran/use_device_addr-2.f90: Ditto.
+	* testsuite/libgomp.fortran/workshare1.f90: Ditto.
+	* testsuite/libgomp.fortran/workshare2.f90: Ditto.
+
 2019-10-28  Tobias Burnus  <tobias@codesourcery.com>
 
 	* testsuite/libgomp.oacc-fortran/abort-1.f90: Add 'dg-do run'.
diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
index 132617b5c27..62a5ef9d96c 100644
--- a/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
+++ b/libgomp/testsuite/libgomp.fortran/lastprivate1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 program lastprivate
   integer :: i
   common /c/ i
diff --git a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90 b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
index 6cd5760206c..97b6007e1ef 100644
--- a/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
+++ b/libgomp/testsuite/libgomp.fortran/lastprivate2.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 program lastprivate
   integer :: i, k
   common /c/ i, k
diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
index bc8614a340a..6143bfb283c 100644
--- a/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
+++ b/libgomp/testsuite/libgomp.fortran/nestedfn4.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 program foo
   integer :: i, j, k
   integer :: a(10), c(10)
diff --git a/libgomp/testsuite/libgomp.fortran/pr25219.f90 b/libgomp/testsuite/libgomp.fortran/pr25219.f90
index 61dd1bc04e6..3b10fceb8b7 100644
--- a/libgomp/testsuite/libgomp.fortran/pr25219.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr25219.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! PR fortran/25219
 
   implicit none
diff --git a/libgomp/testsuite/libgomp.fortran/pr28390.f b/libgomp/testsuite/libgomp.fortran/pr28390.f
index a667e08f73e..9b2d29d2f73 100644
--- a/libgomp/testsuite/libgomp.fortran/pr28390.f
+++ b/libgomp/testsuite/libgomp.fortran/pr28390.f
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! PR fortran/28390
       program pr28390
       integer i
diff --git a/libgomp/testsuite/libgomp.fortran/pr35130.f90 b/libgomp/testsuite/libgomp.fortran/pr35130.f90
index e6be64f15f5..940531e823a 100644
--- a/libgomp/testsuite/libgomp.fortran/pr35130.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr35130.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! PR middle-end/35130
 
 program pr35130
diff --git a/libgomp/testsuite/libgomp.fortran/pr90779.f90 b/libgomp/testsuite/libgomp.fortran/pr90779.f90
index a6d687abfe6..c14dc87dd00 100644
--- a/libgomp/testsuite/libgomp.fortran/pr90779.f90
+++ b/libgomp/testsuite/libgomp.fortran/pr90779.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! PR middle-end/90779
 
 program pr90779
diff --git a/libgomp/testsuite/libgomp.fortran/target-simd.f90 b/libgomp/testsuite/libgomp.fortran/target-simd.f90
index a58e6a57d15..158347b59dc 100644
--- a/libgomp/testsuite/libgomp.fortran/target-simd.f90
+++ b/libgomp/testsuite/libgomp.fortran/target-simd.f90
@@ -14,7 +14,7 @@ program test
     b(i) = 5.0 * a(i)
   end do
 
-  if (any (b - 5.0 *a > 10.0*epsilon(a))) call abort()
+  if (any (b - 5.0 *a > 10.0*epsilon(a))) stop 1
 
   !$omp target simd map(to:a) map(from:b)
   do i = 1, size(a)
@@ -22,5 +22,5 @@ program test
   end do
   !$omp end target simd
 
-  if (any (b - 2.0 *a > 10.0*epsilon(a))) call abort()
+  if (any (b - 2.0 *a > 10.0*epsilon(a))) stop 2
 end program test
diff --git a/libgomp/testsuite/libgomp.fortran/task2.f90 b/libgomp/testsuite/libgomp.fortran/task2.f90
index 27151415043..4f363b684a5 100644
--- a/libgomp/testsuite/libgomp.fortran/task2.f90
+++ b/libgomp/testsuite/libgomp.fortran/task2.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! { dg-options "-std=legacy" }
 
   integer :: err
diff --git a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90 b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
index 3f6b38a35f9..145f54f8911 100644
--- a/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskgroup1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
   integer :: v(16), i
   do i = 1, 16
     v(i) = i
diff --git a/libgomp/testsuite/libgomp.fortran/taskloop1.f90 b/libgomp/testsuite/libgomp.fortran/taskloop1.f90
index 48904b145bd..44a14c2433c 100644
--- a/libgomp/testsuite/libgomp.fortran/taskloop1.f90
+++ b/libgomp/testsuite/libgomp.fortran/taskloop1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
   common /blk/ q, e
   integer :: q, r
   logical :: e
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
index 2e5ce60d47c..69607e03e88 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! Comprehensive run-time test for use_device_addr
 !
 ! Differs from use_device_addr-2.f90 by using a 8-byte variable (c_double)
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
index bddb4491414..391a8313aec 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-2.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! Comprehensive run-time test for use_device_addr
 !
 ! Differs from use_device_addr-1.f90 by using a 4-byte variable (c_float)
diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
index 93c61216034..ac69df559c9 100644
--- a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 ! Test whether use_device_ptr properly handles OPTIONAL arguments
 ! (Only case of present arguments is tested)
 program test_it
@@ -14,11 +15,11 @@ contains
   subroutine foo(ii)
     integer, pointer, optional :: ii
 
-    if (.not.present(ii)) call abort()
-    if (.not.associated(ii, ixx)) call abort()
+    if (.not.present(ii)) stop 1
+    if (.not.associated(ii, ixx)) stop 2
     !$omp target data map(to:ixx) use_device_ptr(ii)
-    if (.not.present(ii)) call abort()
-    if (.not.associated(ii)) call abort()
+    if (.not.present(ii)) stop 3
+    if (.not.associated(ii)) stop 4
     !$omp end target data
   end subroutine foo
 
@@ -26,11 +27,11 @@ contains
   subroutine bar(jj)
     integer, pointer, optional :: jj
 
-    if (.not.present(jj)) call abort()
-    if (associated(jj)) call abort()
+    if (.not.present(jj)) stop 5
+    if (associated(jj)) stop 6
     !$omp target data map(to:ixx) use_device_ptr(jj)
-    if (.not.present(jj)) call abort()
-   if (associated(jj)) call abort()
+    if (.not.present(jj)) stop 7
+   if (associated(jj)) stop 8
     !$omp end target data
   end subroutine bar
 end program test_it
diff --git a/libgomp/testsuite/libgomp.fortran/workshare1.f90 b/libgomp/testsuite/libgomp.fortran/workshare1.f90
index 1d2ba7d3ee2..f50928e0a47 100644
--- a/libgomp/testsuite/libgomp.fortran/workshare1.f90
+++ b/libgomp/testsuite/libgomp.fortran/workshare1.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 function foo ()
   integer :: foo
   logical :: foo_seen
diff --git a/libgomp/testsuite/libgomp.fortran/workshare2.f90 b/libgomp/testsuite/libgomp.fortran/workshare2.f90
index 655a450885e..88b50fbe457 100644
--- a/libgomp/testsuite/libgomp.fortran/workshare2.f90
+++ b/libgomp/testsuite/libgomp.fortran/workshare2.f90
@@ -1,3 +1,4 @@
+! { dg-do run }
 subroutine f1
   integer a(20:50,70:90)
 !$omp parallel workshare
-- 
2.30.2