More more closure tests to the closure test directory

testsuite/libffi.bhaible/bhaible.exp

@@ -47,7 +47,13 @@ for {set i 1} {$i < 82} {incr i} {
 set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/test-callback.c]]
 
 for {set i 1} {$i < 81} {incr i} {
+    if { [libffi_feature_test "#if FFI_CLOSURES"] } {
         run-many-tests $tlist [format "-DDGTEST=%d %s" $i $warning_options]
+    } else {
+        foreach test $tlist {
+            unsupported [format "%s -DDGTEST=%d %s" $test $i $warning_options]
+        }
+    }
 }
 
 dg-finish

testsuite/libffi.closures/closure.exp

@@ -43,6 +43,22 @@ if { [libffi_feature_test "#if FFI_CLOSURES"] } {
     }
 }
 
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.cc]]
+
+# No C++ for or1k
+if { [istarget "or1k-*-*"] } {
+    foreach test $tlist {
+        unsupported "$test"
+    }
+} else {
+    if { [libffi_feature_test "#if FFI_CLOSURES"] } {
+        run-many-tests $tlist  $additional_options
+    } else {
+        foreach test $tlist {
+	    unsupported "$test"
+    }
+}
+
 dg-finish
 
 # Local Variables: