re PR testsuite/40699 (All sparcv9 libjava execution tests fail on Solaris 11/SPARC)
gcc/testsuite/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * lib/gcc-defs.exp, lib/target-libpath.exp, lib/objc.exp, lib/gfortran.exp, lib/g++.exp, lib/obj-c++.exp, lib/c-torture.exp, lib/gcc-dg.exp, lib/gnat.exp, g++.dg/compat/compat.exp, g++.dg/compat/struct-layout-1.exp: Revert 2009-06-30 commit. libstdc++-v3/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libstdc++.exp: Revert 2009-06-30 commit. libjava/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libjava.exp: Revert 2009-06-30 commit. libgomp/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libgomp.exp: Revert 2009-07-02 and 2009-06-30 commits. * testsuite/libgomp.c/c.exp, testsuite/libgomp.c++/c++.exp, testsuite/libgomp.fortran/fortran.exp: Revert 2009-06-30 commits. libffi/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libffi-dg.exp: Revert 2009-07-02, 2009-07-01 and 2009-06-30 commits. libmudflap/ PR testsuite/40699 PR testsuite/40707 PR testsuite/40709 * testsuite/lib/libmudflap.exp: Revert 2009-06-30 commit. From-SVN: r149508
This commit is contained in:
committed by
Richard Sandiford
parent
82e4509550
commit
33cde5161f
@@ -1,3 +1,10 @@
|
||||
2009-07-11 Richard Sandiford <rdsandiford@googlemail.com>
|
||||
|
||||
PR testsuite/40699
|
||||
PR testsuite/40707
|
||||
PR testsuite/40709
|
||||
* testsuite/lib/libjava.exp: Revert 2009-06-30 commit.
|
||||
|
||||
2009-06-30 Richard Sandiford <r.sandiford@uk.ibm.com>
|
||||
|
||||
* testsuite/lib/libjava.exp (libjava_init): Just add
|
||||
|
||||
@@ -197,8 +197,36 @@ proc libjava_init { args } {
|
||||
}
|
||||
|
||||
# Finally, add the gcc build directory so that we can find the
|
||||
# shared libgcc.
|
||||
set libjava_libgcc_s_path [find_libgcc_s $GCJ_UNDER_TEST]
|
||||
# shared libgcc. This, like much of dejagnu, is hideous.
|
||||
set libjava_libgcc_s_path {}
|
||||
|
||||
if { [istarget "*-*-darwin*"] } {
|
||||
set so_extension "dylib"
|
||||
} elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
|
||||
set so_extension "dll"
|
||||
} else {
|
||||
set so_extension "so"
|
||||
}
|
||||
set gccdir [lookfor_file $tool_root_dir gcc/libgcc_s.${so_extension}]
|
||||
if {$gccdir != ""} {
|
||||
set gccdir [file dirname $gccdir]
|
||||
lappend libjava_libgcc_s_path $gccdir
|
||||
verbose "libjava_libgcc_s_path = $libjava_libgcc_s_path"
|
||||
set compiler ${gccdir}/xgcc
|
||||
if { [is_remote host] == 0 && [which $compiler] != 0 } {
|
||||
foreach i "[exec $compiler --print-multi-lib]" {
|
||||
set mldir ""
|
||||
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
|
||||
set mldir [string trimright $mldir "\;@"]
|
||||
if { "$mldir" == "." } {
|
||||
continue
|
||||
}
|
||||
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.${so_extension}.*]] >= 1 } {
|
||||
lappend libjava_libgcc_s_path "${gccdir}/${mldir}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
set libjava_initialized 1
|
||||
}
|
||||
@@ -309,8 +337,6 @@ proc libjava_arguments {{mode compile}} {
|
||||
# Basically we want to build up a colon separated path list from
|
||||
# the value of $libjava.
|
||||
|
||||
# Add "." to the list so that we pick up shared libraries created
|
||||
# by the testsuite itself.
|
||||
set lpath "."
|
||||
foreach dir [list $libjava] {
|
||||
foreach item [split $dir " "] {
|
||||
@@ -444,8 +470,8 @@ proc gcj_invoke {program expectFile ld_library_additions} {
|
||||
global ld_library_path
|
||||
|
||||
set ld_library_path "$libjava_ld_library_path"
|
||||
foreach path $ld_library_additions {
|
||||
add_path ld_library_path $path
|
||||
if {[llength $ld_library_additions] > 0} {
|
||||
append ld_library_path :[join $ld_library_additions :]
|
||||
}
|
||||
|
||||
set_ld_library_path_env_vars
|
||||
@@ -486,8 +512,8 @@ proc exec_gij {jarfile expectFile {ld_library_additions {}} {addl_flags {}}} {
|
||||
global ld_library_path
|
||||
|
||||
set ld_library_path "$libjava_ld_library_path"
|
||||
foreach path $ld_library_additions {
|
||||
add_path ld_library_path $path
|
||||
if {[llength $ld_library_additions] > 0} {
|
||||
append ld_library_path :[join $ld_library_additions :]
|
||||
}
|
||||
|
||||
set_ld_library_path_env_vars
|
||||
@@ -536,8 +562,8 @@ proc libjava_invoke {errname testName optName executable inpfile resultfile
|
||||
global ld_library_path
|
||||
|
||||
set ld_library_path "$libjava_ld_library_path"
|
||||
foreach path $ld_library_additions {
|
||||
add_path ld_library_path $path
|
||||
if {[llength $ld_library_additions] > 0} {
|
||||
append ld_library_path :[join $ld_library_additions :]
|
||||
}
|
||||
|
||||
set_ld_library_path_env_vars
|
||||
|
||||
Reference in New Issue
Block a user