Commit 91a7fbe94e3884536cf2eb8e644bc79d6b19c80e
2019-11-20T07:16:41
Fix or1k lack-of-g++ checking in testsuite
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp
index ab47415..13ba2bd 100644
--- a/testsuite/libffi.call/call.exp
+++ b/testsuite/libffi.call/call.exp
@@ -32,10 +32,21 @@ if { [string match $compiler_vendor "microsoft"] } {
set additional_options "";
}
-set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]]
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.c]]
run-many-tests $tlist $additional_options
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.cc]]
+
+# No C++ for or1k
+if { [istarget "or1k-*-*"] } {
+ foreach test $tlist {
+ unsupported "$test"
+ }
+} else {
+ run-many-tests $tlist $additional_options
+}
+
dg-finish
# Local Variables:
diff --git a/testsuite/libffi.call/unwindtest.cc b/testsuite/libffi.call/unwindtest.cc
index 69ebe9d..e114565 100644
--- a/testsuite/libffi.call/unwindtest.cc
+++ b/testsuite/libffi.call/unwindtest.cc
@@ -4,7 +4,7 @@
PR: none.
Originator: Jeff Sturm <jsturm@one-point.com> */
-/* { dg-do run { xfail x86_64-apple-darwin* moxie*-*-* or1k-*-* } } */
+/* { dg-do run { xfail x86_64-apple-darwin* moxie*-*-* } } */
#include "ffitest.h"
diff --git a/testsuite/libffi.call/unwindtest_ffi_call.cc b/testsuite/libffi.call/unwindtest_ffi_call.cc
index 65296f1..153d240 100644
--- a/testsuite/libffi.call/unwindtest_ffi_call.cc
+++ b/testsuite/libffi.call/unwindtest_ffi_call.cc
@@ -4,7 +4,7 @@
PR: none.
Originator: Andreas Tobler <andreast@gcc.gnu.org> 20061213 */
-/* { dg-do run { xfail moxie*-*-* or1k-unknown-elf } } */
+/* { dg-do run { xfail moxie*-*-* } } */
#include "ffitest.h"