aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/libjava.cni/cni.exp
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/testsuite/libjava.cni/cni.exp')
-rw-r--r--libjava/testsuite/libjava.cni/cni.exp26
1 files changed, 13 insertions, 13 deletions
diff --git a/libjava/testsuite/libjava.cni/cni.exp b/libjava/testsuite/libjava.cni/cni.exp
index 9e4d002bd7e..8d0bc83f2f4 100644
--- a/libjava/testsuite/libjava.cni/cni.exp
+++ b/libjava/testsuite/libjava.cni/cni.exp
@@ -69,18 +69,18 @@ proc gcj_cni_test_one {file} {
return 1
}
- if {! [bytecompile_file $file [pwd]]} {
- fail "bytecompile $file"
- # FIXME - should use `untested' on all remaining tests.
- # But that is hard.
- return 0
- }
- pass "bytecompile $file"
-
- if {! [gcj_cni_build_headers $file]} {
- # FIXME
- return 0
- }
+# if {! [bytecompile_file $file [pwd]]} {
+# fail "bytecompile $file"
+# # FIXME - should use `untested' on all remaining tests.
+# # But that is hard.
+# return 0
+# }
+# pass "bytecompile $file"
+
+# if {! [gcj_cni_build_headers $file]} {
+# # FIXME
+# return 0
+# }
set cfile [file join [file dirname $file] nat$main.cc]
if {! [gcj_cni_compile_cxx_to_o $cfile]} {
@@ -111,7 +111,7 @@ proc gcj_cni_run {} {
# For now we only test CNI on native builds.
if {$build_triplet == $host_triplet} {
- catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles
+ catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar] } srcfiles
foreach x $srcfiles {
gcj_cni_test_one $x