libstdc++-v3-dg.exp (libstdc++-v3-init): Set flags appropriately for remote testing...

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.

From-SVN: r42272

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b92359c598fae2644bf96c8846aa857beef75e0..b18874ca46322ef691975452d995747872a934e9 100644 (file)
--- 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 978ab0128852c5d6c8df3468427b257af3ad13ad..a2df3ed4e562b5f07bba822c4c61d03a3358a9a5 100644 (file)
--- 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