Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by default

2015-06-30  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libgomp.oacc-c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not
	already set.  Use DEFAULT_CFLAGS in dg-runtest.
	* testsuite/libgomp.oacc-c-c++-common/collapse-3.c: Remove dg-options
	"-O2".

From-SVN: r225194

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index efd08f3cf43ae79de8dc4d1111a7037b6ee8dae4..4e4fcc32e8e59f64831a69fa625331cc886611fa 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-30  Tom de Vries  <tom@codesourcery.com>
+
+       * testsuite/libgomp.oacc-c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not
+       already set.  Use DEFAULT_CFLAGS in dg-runtest.
+       * testsuite/libgomp.oacc-c-c++-common/collapse-3.c: Remove dg-options
+       "-O2".
+
 2015-06-30  Tom de Vries  <tom@codesourcery.com>
 
        * testsuite/libgomp.c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not

diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
index f486f9b97ba8a91986a0096e638c987dcf38f0b5..80d135919cf2209d08211063620cadda14b8893e 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
@@ -13,6 +13,11 @@ if [info exists lang_include_flags] then {
     unset lang_include_flags
 }
 
+# If a testcase doesn't have special options, use these.
+if ![info exists DEFAULT_CFLAGS] then {
+    set DEFAULT_CFLAGS "-O2"
+}
+
 # Initialize dg.
 dg-init
 
@@ -96,7 +101,7 @@ if { $lang_test_file_found } {
 
        setenv ACC_DEVICE_TYPE $offload_target_openacc
 
-       dg-runtest $tests "$tagopt" $libstdcxx_includes
+       dg-runtest $tests "$tagopt" "$libstdcxx_includes $DEFAULT_CFLAGS"
     }
 }
 

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
index a5be7287d22fe39322179c5c83014586eff2a230..680042892e459f6f102cc9767f5383d5c2c636fd 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 #include <string.h>
 #include <stdlib.h>