summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-27 16:29:04 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-27 16:29:04 +0000
commitde05de6d353c945d2f9d38109b630cd995fed0d0 (patch)
tree54dc1f778f1aa5fda58358acb738f1e864da3244
parent14692ceb6cd2c5e34bb7a517ae7f1f85bcde4179 (diff)
downloadgcc-de05de6d353c945d2f9d38109b630cd995fed0d0.tar.gz
2002-03-27 Anthony Green <green@redhat.com>
* libjava.jni/jni.exp (gcj_jni_run): Fix cross build test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51453 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/testsuite/ChangeLog4
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp4
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 097d0aadf27..bb98b6d5d06 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2002-03-27 Anthony Green <green@redhat.com>
+ * libjava.jni/jni.exp (gcj_jni_run): Fix cross build test.
+
+2002-03-27 Anthony Green <green@redhat.com>
+
* lib/libjava.exp: Add the wrapper link options only when we're
linking.
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 049383eb177..724b2545acb 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -163,10 +163,10 @@ proc gcj_jni_test_one {file} {
# Run the JNI tests.
proc gcj_jni_run {} {
global srcdir subdir
- global target_triplet host_triplet
+ global build_triplet host_triplet
# For now we only test JNI on native builds.
- if {$target_triplet == $host_triplet} {
+ if {$build_triplet == $host_triplet} {
catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
foreach x $srcfiles {