diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-12 09:04:05 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-12 09:04:05 +0000 |
| commit | 7e9f24e0fb568db822a42f808c0eb6699ce3d08a (patch) | |
| tree | 7f5c19cc281af7f2ecf1da167e72bb6d8d42f0f9 /libjava | |
| parent | 9e1f1fbfb4f4204090354ba1a5769dd7bd98faa4 (diff) | |
| download | gcc-7e9f24e0fb568db822a42f808c0eb6699ce3d08a.tar.gz | |
libjava:
PR testsuite/21164
* testsuite/lib/libjava.exp: Load dg.exp.
* testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Strip srcdir
from jarfile.
Use result for messages.
* testsuite/libjava.loader/loader.exp (gcj_loader_test_one): Pass
errname to libjava_invoke, fix testname.
gcc:
PR testsuite/21164
* lib/compat.exp (compat-execute): Declare unsupported after
stripping path from src1.
* lib/lto.exp (lto-execute): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172302 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 4 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jar/jar.exp | 7 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.loader/loader.exp | 2 |
4 files changed, 18 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 51dd786b528..5bbcd6ebcae 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2011-04-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR testsuite/21164 + * testsuite/lib/libjava.exp: Load dg.exp. + * testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Strip srcdir + from jarfile. + Use result for messages. + * testsuite/libjava.loader/loader.exp (gcj_loader_test_one): Pass + errname to libjava_invoke, fix testname. + 2011-04-08 Kai Tietz <ktietz@redhat.com> * configure.ac (libgcj_ld_export_all): Set for windows diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index b05c56843cc..0de823b737c 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2011 +# Free Software Foundation proc load_gcc_lib { filename } { global srcdir @@ -6,6 +7,7 @@ proc load_gcc_lib { filename } { } load_lib libgloss.exp +load_lib dg.exp load_gcc_lib target-libpath.exp # GCJ_UNDER_TEST is the compiler under test. diff --git a/libjava/testsuite/libjava.jar/jar.exp b/libjava/testsuite/libjava.jar/jar.exp index 65565832e79..e57bcb3e540 100644 --- a/libjava/testsuite/libjava.jar/jar.exp +++ b/libjava/testsuite/libjava.jar/jar.exp @@ -20,17 +20,18 @@ proc gcj_jar_interpret {jarfile} { global INTERPRETER srcdir set gij [libjava_find_gij] + set errname [dg-trim-dirname $srcdir $jarfile] # libjava_find_gij will return "" if it couldn't find the # program; in this case we want to skip the test. if {$INTERPRETER != "yes" || $gij == ""} { - untested "$jarfile execution - gij test" - untested "$jarfile output - gij test" + untested "$errname execution - gij test" + untested "$errname output - gij test" return } set opts(_) {} set out [file rootname $jarfile].out - libjava_invoke $jarfile "gij test" opts $gij {} $out \ + libjava_invoke $errname "gij test" opts $gij {} $out \ "" -jar $jarfile } diff --git a/libjava/testsuite/libjava.loader/loader.exp b/libjava/testsuite/libjava.loader/loader.exp index a94e4e9eaab..cdb356bd035 100644 --- a/libjava/testsuite/libjava.loader/loader.exp +++ b/libjava/testsuite/libjava.loader/loader.exp @@ -34,7 +34,7 @@ proc gcj_loader_test_one {srcfile} { } pass "$errname compilation from source" - libjava_invoke $executable $executable "" $executable "" $resfile "" + libjava_invoke $errname "source compiled test" "" $executable "" $resfile "" return 1 } |