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

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index e0cd567d0d1e3e75d1cfc88d9283b692f9948ce0..f4f30fb697d3ba44e877a72896b9cbf9b99cbd71 100644 (file)
--- 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 bbdbe2f9ec4bb4b4fcdc50ebfb4642a9e8a5a797..608b298d81e1e55af3acaa1a469feabf97dabbd4 100644 (file)
--- 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.