yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re PR testsuite/21164 (libjava tests uses absolute paths)

Browse Source 
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.

From-SVN: r172302
This commit is contained in:
Rainer Orth
2011-04-12 09:04:05 +00:00
committed by Rainer Orth
parent e30ecc5d62
commit c9c0db83bb
7 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/ChangeLog
+10
View File
@@ -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
libjava/testsuite/lib/libjava.exp
+3 -1
View File
@@ -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.
libjava/testsuite/libjava.jar/jar.exp
+4 -3
View File
@@ -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
}
libjava/testsuite/libjava.loader/loader.exp
+1 -1
View File
@@ -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
}