aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite/libjava.jni
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-12-13 05:00:15 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-12-13 05:00:15 +0000
commit19eaa5a38b8e3c6e2974d5a52ad2e729d9665a12 (patch)
tree73f2abae246af7f6615b11cc01bfe25e9809e4e8 /libjava/testsuite/libjava.jni
parentdd05b1b461a3ba163cac1e3ce7801ce042ea2964 (diff)
downloadgcc-19eaa5a38b8e3c6e2974d5a52ad2e729d9665a12.zip
gcc-19eaa5a38b8e3c6e2974d5a52ad2e729d9665a12.tar.gz
gcc-19eaa5a38b8e3c6e2974d5a52ad2e729d9665a12.tar.bz2
loader.exp (gcj_loader_test_one): Use libjava_prune_warnings.
* libjava.loader/loader.exp (gcj_loader_test_one): Use libjava_prune_warnings. (gcj_loader_run): Likewise. * libjava.mauve/mauve.exp (test_mauve): Use libjava_prune_warnings. (test_mauve_sim): Likewise. * libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Use libjava_prune_warnings. (gcj_jni_build_header): Likewise. * lib/libjava.exp (libjava_prune_warnings): New proc. (gcj_link): Use it. (test_libjava_from_source): Likewise. (test_libjava_from_javac): Likewise. From-SVN: r60089
Diffstat (limited to 'libjava/testsuite/libjava.jni')
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index efd8154..2aec4c9 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -15,7 +15,8 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
# Find jni.h.
lappend options "additional_flags=-I$srcdir/../include"
- set x [prune_warnings [target_compile $file $soname executable $options]]
+ set x [libjava_prune_warnings \
+ [target_compile $file $soname executable $options]]
if {$x != ""} {
verbose "target_compile failed: $x" 2
fail "$name.c compilation"
@@ -30,7 +31,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
proc gcj_jni_build_header {file} {
set gcjh [find_gcjh]
set file [file rootname $file]
- set x [string trim [prune_warnings \
+ set x [string trim [libjava_prune_warnings \
[lindex [local_exec "$gcjh -jni $file" "" "" 300] 1]]]
if {$x != ""} {
verbose "local_exec failed: $x" 2