# libstdc++_* callbacks we don't define, but could:
# ..._option_help prints additional --help output
# ..._option_proc (--foo) process our own options
-# ..._exit cleanup routines (do we need any?)
# ..._init (normal.exp) called once per test file
# ..._finish bracketing function for libstdc++_init
# ...-dg-prune removing output text, see top of system dg.exp
load_lib dg.exp
load_lib libgloss.exp
# compiler routines, then ours
+load_gcc_lib target-supports.exp
+load_gcc_lib target-supports-dg.exp
load_lib prune.exp
load_lib dg-options.exp
+load_gcc_lib target-libpath.exp
+load_gcc_lib wrapper.exp
# Useful for debugging. Pass the name of a variable and the verbosity
# threshold (number of -v's on the command line).
}
# Called by v3-init below. "Static" to this file.
-proc v3-copy-files {srcfiles dstdir} {
+proc v3-copy-files {srcfiles} {
foreach f $srcfiles {
if { [catch { set symlink [file readlink $f] } x] } then {
- file copy -force $f $dstdir
+ remote_download target $f
} else {
if { [regexp "^/" "$symlink"] } then {
- file copy -force $symlink $dstdir
+ remote_download target $symlink
} else {
set dirname [file dirname $f]
- file copy -force $dirname/$symlink $dstdir
+ remote_download target $dirname/$symlink
}
}
}
# Called once, during runtest.exp setup.
proc libstdc++_init { testfile } {
global env
- global srcdir outdir blddir objdir tool_root_dir
+ global srcdir blddir objdir tool_root_dir
global cxx cxxflags
global includes
global gluefile wrap_flags
- global ld_library_path original_ld_library_path
+ global ld_library_path
global target_triplet
+ # We set LC_ALL and LANG to C so that we get the same error messages as expected.
+ setenv LC_ALL C
+ setenv LANG C
+
set blddir [lookfor_file [get_multilibs] libstdc++-v3]
set flags_file "${blddir}/scripts/testsuite_flags"
v3track flags_file 2
# headers, or without assertions.
global DEFAULT_CXXFLAGS
if ![info exists DEFAULT_CXXFLAGS] then {
- set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT"
-
# Set up includes for stdc++.h.gch, the precompiled header file.
if { [file exists $flags_file] } {
set cxxpchflags [exec sh $flags_file --cxxpchflags]
} else {
set cxxpchflags ""
}
- append DEFAULT_CXXFLAGS " ${cxxpchflags}"
+ set DEFAULT_CXXFLAGS " ${cxxpchflags}"
# Host specific goo here.
if { [string match "powerpc-*-darwin*" $target_triplet] } {
set dg-do-what-default run
# Copy any required data files.
- v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] $outdir
- v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] $outdir
-
- # Setup LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
- # Find the existing LD_LIBRARY_PATH.
- if [info exists env(LD_LIBRARY_PATH)] {
- set original_ld_library_path $env(LD_LIBRARY_PATH)
- # For HP-UX
- } elseif [info exists env(SHLIB_PATH)] {
- set original_ld_library_path $env(SHLIB_PATH)
- # For Darwin:
- } elseif [info exists env(DYLD_LIBRARY_PATH)] {
- set original_ld_library_path $env(DYLD_LIBRARY_PATH)
- # For Solaris 32 bit:
- } elseif [info exists env(LD_LIBRARY_PATH_32)] {
- set original_ld_library_path $env(LD_LIBRARY_PATH_32)
- # For Solaris 64 bit:
- } elseif [info exists env(LD_LIBRARY_PATH_64)] {
- set original_ld_library_path $env(LD_LIBRARY_PATH_64)
- } else {
- set original_ld_library_path ""
- }
+ v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"]
+ v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"]
# Locate libgcc.a so we don't need to account for different values of
# SHLIB_EXT on different platforms
if { "$mldir" == "." } {
continue
}
- if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] == 1 } {
+ if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
append ld_library_path ":${gccdir}/${mldir}"
}
}
}
append ld_library_path ":${blddir}/src/.libs"
- # On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
- # called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
- # (for the 64-bit ABI). The right way to do this would be to modify
- # unix.exp -- but that's not an option since it's part of DejaGNU
- # proper, so we do it here.
- # The same applies to darwin (DYLD_LIBRARY_PATH), solaris 32 bit
- # (LD_LIBRARY_PATH_32), solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX
- # (SHLIB_PATH).
- setenv LD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path"
- setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
- setenv LD_LIBRARYN32_PATH "$ld_library_path:$original_ld_library_path"
- setenv LD_LIBRARY64_PATH "$ld_library_path:$original_ld_library_path"
- setenv LD_RUN_PATH "$ld_library_path:$original_ld_library_path"
- setenv LD_LIBRARY_PATH_32 "$ld_library_path:$original_ld_library_path"
- setenv LD_LIBRARY_PATH_64 "$ld_library_path:$original_ld_library_path"
- setenv DYLD_LIBRARY_PATH "$ld_library_path:$original_ld_library_path"
- verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
+ set_ld_library_path_env_vars
+ if [info exists env(LD_LIBRARY_PATH)] {
+ verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
+ }
# Do a bunch of handstands and backflips for cross compiling and
# finding simulators...
return "untested"
}
set cxx [transform "g++"]
- set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT"
+ set cxxflags "-ggdb3"
set includes "-I./"
} else {
# If we find a testsuite_flags file, we're testing in the build dir.
set includes [exec sh $flags_file --build-includes]
} else {
set cxx [transform "g++"]
- set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT"
+ set cxxflags "-ggdb3"
set includes "-I${srcdir}"
}
}
- if { [target_info needs_status_wrapper]!=""} {
- file delete ${objdir}/testglue.o;
- set gluefile ${objdir}/testglue.o;
- set result [build_wrapper $gluefile];
- if { $result != "" } {
- set gluefile [lindex $result 0];
- set wrap_flags [lindex $result 1];
- } else {
- unset gluefile
- }
+ libstdc++_maybe_build_wrapper "${objdir}/testglue.o"
+}
+
+# Callback for cleanup routines.
+proc libstdc++_exit { } {
+ global gluefile;
+
+ if [info exists gluefile] {
+ file_on_build delete $gluefile;
+ unset gluefile;
}
}
# Called once, from libstdc++/normal.exp.
proc v3-list-tests { filename } {
global srcdir
- global outdir
-
- set tests_file "${outdir}/${filename}"
+ global blddir
+
+ set tests_file "${blddir}/testsuite/${filename}"
set sfiles ""
+ verbose -log "In v3-list-tests"
+ verbose -log "blddir = ${blddir}"
+ verbose -log "tests_file = $tests_file"
+
# If there is a testsuite_file, use it.
if { [file exists $tests_file] } {
set f [open $tests_file]
OSDN Git Service
