re PR testsuite/64850 (FAIL: gfortran.dg/goacc/acc_on_device-1.f95 -O scan-rtl...

PR testsuite/64850
Tweak acc_on_device* tests.

From-SVN: r220711

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f58cfcc1272b5b3d1051792be90b41dd197c0cf9..587b7a36d751efa4600c9cb155e1e60742fb2566 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2015--02-14  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+       PR testsuite/64850
+       * gcc.dg/goacc/acc_on_device-1.c: Use a space instead of \\\" in
+       the expression to find calls.
+       * c-c++-common/goacc/acc_on_device-2.c: Likewise.
+       * c-c++-common/goacc/acc_on_device-2-off.c: Likewise.
+       * gfortran.dg/goacc/acc_on_device-1.f95: Likewise.
+       * gfortran.dg/goacc/acc_on_device-2.f95: Likewise.
+       * gfortran.dg/goacc/acc_on_device-2-off.f95: Likewise.
+
 2015-02-14  Marek Polacek  <polacek@redhat.com>
 
        PR c/64768

diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
index 25d21ad29c90acfc49c6919dcd66c4372eb9a001..ea310470212545df198010234965010aad601188 100644 (file)
--- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
+++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
@@ -20,6 +20,6 @@ f (void)
 }
 
 /* Without -fopenacc, we're expecting one call.
-   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 1 "expand" } } */
+   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 1 "expand" } } */
 
 /* { dg-final { cleanup-rtl-dump "expand" } } */

diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
index d5389a99072ccad0f14ed34f3393e499f173c525..2f4ee2bbbde48636f876bad7f76e6093e7871d63 100644 (file)
--- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
@@ -24,6 +24,6 @@ f (void)
    perturbs expansion as a builtin, which expects an int parameter.  It's fine
    when changing acc_device_t to plain int, but that's not what we're doing in
    <openacc.h>.
-   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 0 "expand" { xfail c++ } } } */
+   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail c++ } } } */
 
 /* { dg-final { cleanup-rtl-dump "expand" } } */

diff --git a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
index 1a0276e04d2baa80490e3249d4977792684deb83..d0dbc82670b9345c53a981b72fbaba67d0dd7994 100644 (file)
--- a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
+++ b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
@@ -15,6 +15,6 @@ f (void)
 }
 
 /* Unsuitable to be handled as a builtin, so we're expecting four calls.
-   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 4 "expand" } } */
+   { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 4 "expand" } } */
 
 /* { dg-final { cleanup-rtl-dump "expand" } } */

diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
index 9dfde26f76b98aab358c1abe6e2454ff6823a49c..0126d9c6d9951adf3156aec08a607aa3fd492a06 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
@@ -17,6 +17,6 @@ logical function f ()
 end function f
 
 ! Unsuitable to be handled as a builtin, so we're expecting four calls.
-! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 4 "expand" } }
+! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 4 "expand" } }
 
 ! { dg-final { cleanup-rtl-dump "expand" } }

diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
index cf2826475a3f4e0eecc04bd0d900613eaf336812..0a4978e3f6b95c0fb5a5e098f2de67c8ffae96c5 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
@@ -34,6 +34,6 @@ logical (4) function f ()
 end function f
 
 ! Without -fopenacc, we're expecting one call.
-! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 1 "expand" } }
+! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 1 "expand" } }
 
 ! { dg-final { cleanup-rtl-dump "expand" } }

diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
index 7730a60a7dcca6454440e9009fbb7988da363421..43ad022fb4008c1778a5c2b9bf684b31ba0c72e1 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
@@ -35,6 +35,6 @@ end function f
 
 ! With -fopenacc, we're expecting the builtin to be expanded, so no calls.
 ! TODO: not working.
-! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]*\\\"acc_on_device" 0 "expand" { xfail *-*-* } } }
+! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail *-*-* } } }
 
 ! { dg-final { cleanup-rtl-dump "expand" } }