[v3] testsuite vs. cxxflags, others

[Daniel Jacobowitz]

On Mon, Sep 10, 2007 at 07:26:19PM -0400, Daniel Jacobowitz wrote:
> On Mon, Sep 10, 2007 at 06:02:15PM -0500, Benjamin Kosnik wrote:
> > 
> > Reverting just this part will fix it, no?
> 
> I think so, but let me give it a try and I'll let you know for sure
> tomorrow.

Yes, it looks like it.  Here's what I tested.

-- 
Daniel Jacobowitz
CodeSourcery

2007-09-11  Daniel Jacobowitz  <dan@codesourcery.com>

	* testsuite/lib/libstdc++.exp (libstdc++_init): Revert part of
	2007-09-06 change.

Index: lib/libstdc++.exp
===================================================================
--- lib/libstdc++.exp	(revision 128363)
+++ lib/libstdc++.exp	(working copy)
@@ -171,6 +171,13 @@ proc libstdc++_init { testfile } {
 	set compiler [transform "g++"]
     }
 
+    # Default settings.
+    set cxx [transform "g++"]
+    set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0"
+    set cxxldflags ""
+    set cc [transform "gcc"]
+    # Locate testsuite_hooks.h and other testsuite headers.
+    set includes "-I${srcdir}/util"
     # Adapt the defaults for special circumstances.
     if [is_remote host] {
 	# A remote host does not, in general, have access to the
@@ -199,12 +206,6 @@ proc libstdc++_init { testfile } {
 		return "untested"
 	    }
 	}
-	# Default settings.
-	set cxx [transform "g++"]
-	set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0 " 
-	set cxxldflags ""
-	set cc [transform "gcc"]
-	# Locate testsuite_hooks.h and other testsuite headers.	
 	set includes "-Iutil"
     } elseif { [file exists $flags_file] } {
         # If we find a testsuite_flags file, we're testing in the build dir.