aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2016-03-29 15:24:22 +0200
committerThomas Schwinge <tschwinge@gcc.gnu.org>2016-03-29 15:24:22 +0200
commitce83104bd8ce698a0a544f0eb9818a91b341ca5a (patch)
treeed9e279fbd16cfd37ff2f09aba3ca62e9d16b935
parent5f9a167b52b3ab1ce20108c146f136ddf7dbffc9 (diff)
downloadgcc-ce83104bd8ce698a0a544f0eb9818a91b341ca5a.zip
gcc-ce83104bd8ce698a0a544f0eb9818a91b341ca5a.tar.gz
gcc-ce83104bd8ce698a0a544f0eb9818a91b341ca5a.tar.bz2
Avoid ERROR in libgomp.oacc-c++/c++.exp in non-C++ configurations
libgomp/ * testsuite/libgomp.oacc-c++/c++.exp [!lang_test_file_found]: Call set-torture-options. From-SVN: r234519
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/testsuite/libgomp.oacc-c++/c++.exp4
2 files changed, 9 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index e0cd567..f4f30fb 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-29 Thomas Schwinge <thomas@codesourcery.com>
+
+ * testsuite/libgomp.oacc-c++/c++.exp [!lang_test_file_found]: Call
+ set-torture-options.
+
2016-03-24 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/libgomp.oacc-c++/c++.exp: Set up torture testing, use
diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
index bbdbe2f..608b298 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
@@ -122,6 +122,10 @@ if { $lang_test_file_found } {
gcc-dg-runtest $tests "$tagopt" "$libstdcxx_includes"
}
+} else {
+ # Call this once, which placates the subsequent torture-finish.
+ set-torture-options [list \
+ { INVALID } ]
}
# See above.