diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-18 18:55:44 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-18 18:55:44 +0000 |
| commit | ca6fc9bcdcfc9559d178e778bb173b7e72cb417b (patch) | |
| tree | 5c8859f4e7f61240d9795ca69b3031ac09e3efc6 /libstdc++-v3 | |
| parent | d210f3fff74356d78e758863a76d961f69971b4e (diff) | |
| download | gcc-ca6fc9bcdcfc9559d178e778bb173b7e72cb417b.tar.gz | |
2001-05-18 Angela Marie Thomas <angela@cygnus.com>
* testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set flags
appropriately for remote testing and testing installed files without
a build dir.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42272 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7b92359c598..b18874ca463 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2001-05-18 Angela Marie Thomas <angela@cygnus.com> + + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Set flags + appropriately for remote testing and testing installed files without + a build dir. + 2001-05-18 Benjamin Kosnik <bkoz@redhat.com> * acinclude.m4 (GLIBCPP_EXPORT_INSTALL_INFO): Set glibcpp_srcdir diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index 978ab012885..a2df3ed4e56 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -30,9 +30,29 @@ proc libstdc++-v3-init { args } { global gluefile wrap_flags set blddir [lookfor_file $outdir libstdc++-v3] - set cxx [exec sh ${blddir}/testsuite_flags --build-cxx] - set cxxflags [exec sh ${blddir}/testsuite_flags --cxxflags] - set includes [exec sh ${blddir}/testsuite_flags --build-includes] + + if [is_remote host] { + set header [remote_download host ${srcdir}/debug_assert.h] + if { $header == "" } { + verbose -log "Unable to download ${srcdir}/debug_assert.h to host." + return "untested" + } + set cxx [transform "g++"] + set cxxflags "-ggdb3 -DDEBUG_ASSERT" + set includes "-I./" + } else { + # If we find a testsuite_flags file, we're testing in the build dir. + set flags_file "${blddir}/testsuite_flags" + if { [file exists $flags_file] } { + set cxx [exec sh $flags_file --build-cxx] + set cxxflags [exec sh $flags_file --cxxflags] + set includes [exec sh $flags_file --build-includes] + } else { + set cxx [transform "g++"] + set cxxflags "-ggdb3 -DDEBUG_ASSERT" + set includes "-I${srcdir}" + } + } # By default, we assume we want to run program images. global dg-do-what-default |