Commit c9c0db83 by Rainer Orth Committed by Rainer Orth

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

	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
parent e30ecc5d
2011-04-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR testsuite/21164
* lib/compat.exp (compat-execute): Declare unsupported after
stripping path from src1.
* lib/lto.exp (lto-execute): Likewise.
2011-04-12 Jakub Jelinek <jakub@redhat.com> 2011-04-12 Jakub Jelinek <jakub@redhat.com>
PR c/48552 PR c/48552
......
# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 # Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2011
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -260,13 +260,6 @@ proc compat-execute { src1 sid use_alt } { ...@@ -260,13 +260,6 @@ proc compat-execute { src1 sid use_alt } {
set dg-do-what [list ${dg-do-what-default} "" P] set dg-do-what [list ${dg-do-what-default} "" P]
set extra_flags_1 [compat-get-options-main $src1] set extra_flags_1 [compat-get-options-main $src1]
# Check whether this test is supported for this target.
if { [lindex ${dg-do-what} 1 ] == "N" } {
unsupported "$src1"
verbose "$src1 not supported on this target, skipping it" 3
return
}
# Set up the names of the other source files. # Set up the names of the other source files.
set dir [file dirname $src1] set dir [file dirname $src1]
set ext [file extension $src1] set ext [file extension $src1]
...@@ -314,10 +307,6 @@ proc compat-execute { src1 sid use_alt } { ...@@ -314,10 +307,6 @@ proc compat-execute { src1 sid use_alt } {
set testcase [string range "$testcase" [string length "$tmpdir/"] end] set testcase [string range "$testcase" [string length "$tmpdir/"] end]
set testcase "tmpdir-$testcase" set testcase "tmpdir-$testcase"
} }
regsub "_main.*" $testcase "" testcase
# Set up the base name of executable files so they'll be unique.
regsub -all "\[./\]" $testcase "-" execbase
# If we couldn't rip $srcdir out of `src1' then just do the best we can. # If we couldn't rip $srcdir out of `src1' then just do the best we can.
# The point is to reduce the unnecessary noise in the logs. Don't strip # The point is to reduce the unnecessary noise in the logs. Don't strip
# out too much because different testcases with the same name can confuse # out too much because different testcases with the same name can confuse
...@@ -326,6 +315,17 @@ proc compat-execute { src1 sid use_alt } { ...@@ -326,6 +315,17 @@ proc compat-execute { src1 sid use_alt } {
set testcase "[file tail [file dirname $src1]]/[file tail $src1]" set testcase "[file tail [file dirname $src1]]/[file tail $src1]"
} }
# Check whether this test is supported for this target.
if { [lindex ${dg-do-what} 1 ] == "N" } {
unsupported "$testcase"
verbose "$testcase not supported on this target, skipping it" 3
return
}
regsub "_main.*" $testcase "" testcase
# Set up the base name of executable files so they'll be unique.
regsub -all "\[./\]" $testcase "-" execbase
# Loop through all of the option lists used for this test. # Loop through all of the option lists used for this test.
set count 0 set count 0
......
...@@ -418,13 +418,6 @@ proc lto-execute { src1 sid } { ...@@ -418,13 +418,6 @@ proc lto-execute { src1 sid } {
set lto_option_list $LTO_OPTIONS set lto_option_list $LTO_OPTIONS
} }
# Check whether this test is supported for this target.
if { [lindex ${dg-do-what} 1 ] == "N" } {
unsupported "$src1"
verbose "$src1 not supported on this target, skipping it" 3
return
}
# Set up the names of the other source files. # Set up the names of the other source files.
set dir [file dirname $src1] set dir [file dirname $src1]
set base [file rootname $src1] set base [file rootname $src1]
...@@ -478,11 +471,6 @@ proc lto-execute { src1 sid } { ...@@ -478,11 +471,6 @@ proc lto-execute { src1 sid } {
set testcase [string range "$testcase" [string length "$tmpdir/"] end] set testcase [string range "$testcase" [string length "$tmpdir/"] end]
set testcase "tmpdir-$testcase" set testcase "tmpdir-$testcase"
} }
regsub "_0.*" $testcase "" testcase
# Set up the base name of executable files so they'll be unique.
regsub -all "\[./\]" $testcase "-" execbase
# If we couldn't rip $srcdir out of `src1' then just do the best we can. # If we couldn't rip $srcdir out of `src1' then just do the best we can.
# The point is to reduce the unnecessary noise in the logs. Don't strip # The point is to reduce the unnecessary noise in the logs. Don't strip
# out too much because different testcases with the same name can confuse # out too much because different testcases with the same name can confuse
...@@ -491,6 +479,18 @@ proc lto-execute { src1 sid } { ...@@ -491,6 +479,18 @@ proc lto-execute { src1 sid } {
set testcase "[file tail [file dirname $src1]]/[file tail $src1]" set testcase "[file tail [file dirname $src1]]/[file tail $src1]"
} }
# Check whether this test is supported for this target.
if { [lindex ${dg-do-what} 1 ] == "N" } {
unsupported "$testcase"
verbose "$testcase not supported on this target, skipping it" 3
return
}
regsub "_0.*" $testcase "" testcase
# Set up the base name of executable files so they'll be unique.
regsub -all "\[./\]" $testcase "-" execbase
# Loop through all of the option lists used for this test. # Loop through all of the option lists used for this test.
set count 0 set count 0
foreach option $lto_option_list { foreach option $lto_option_list {
......
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> 2011-04-08 Kai Tietz <ktietz@redhat.com>
* configure.ac (libgcj_ld_export_all): Set for windows * configure.ac (libgcj_ld_export_all): Set for windows
......
# 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 } { proc load_gcc_lib { filename } {
global srcdir global srcdir
...@@ -6,6 +7,7 @@ proc load_gcc_lib { filename } { ...@@ -6,6 +7,7 @@ proc load_gcc_lib { filename } {
} }
load_lib libgloss.exp load_lib libgloss.exp
load_lib dg.exp
load_gcc_lib target-libpath.exp load_gcc_lib target-libpath.exp
# GCJ_UNDER_TEST is the compiler under test. # GCJ_UNDER_TEST is the compiler under test.
......
...@@ -20,17 +20,18 @@ proc gcj_jar_interpret {jarfile} { ...@@ -20,17 +20,18 @@ proc gcj_jar_interpret {jarfile} {
global INTERPRETER srcdir global INTERPRETER srcdir
set gij [libjava_find_gij] set gij [libjava_find_gij]
set errname [dg-trim-dirname $srcdir $jarfile]
# libjava_find_gij will return "" if it couldn't find the # libjava_find_gij will return "" if it couldn't find the
# program; in this case we want to skip the test. # program; in this case we want to skip the test.
if {$INTERPRETER != "yes" || $gij == ""} { if {$INTERPRETER != "yes" || $gij == ""} {
untested "$jarfile execution - gij test" untested "$errname execution - gij test"
untested "$jarfile output - gij test" untested "$errname output - gij test"
return return
} }
set opts(_) {} set opts(_) {}
set out [file rootname $jarfile].out set out [file rootname $jarfile].out
libjava_invoke $jarfile "gij test" opts $gij {} $out \ libjava_invoke $errname "gij test" opts $gij {} $out \
"" -jar $jarfile "" -jar $jarfile
} }
......
...@@ -34,7 +34,7 @@ proc gcj_loader_test_one {srcfile} { ...@@ -34,7 +34,7 @@ proc gcj_loader_test_one {srcfile} {
} }
pass "$errname compilation from source" pass "$errname compilation from source"
libjava_invoke $executable $executable "" $executable "" $resfile "" libjava_invoke $errname "source compiled test" "" $executable "" $resfile ""
return 1 return 1
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment