Merged revisions 2880-2883,2885-2895 via svnmerge from

http://scons.tigris.org/svn/scons/branches/core

........
  r2885 | stevenknight | 2008-04-18 21:38:59 -0700 (Fri, 18 Apr 2008) | 2 lines

  Update troubleshooting appendix for new Taskmaster output.
........
  r2886 | bdbaddog | 2008-04-19 15:15:03 -0700 (Sat, 19 Apr 2008) | 5 lines

  Fix infinite loop in Fortran tool initialization.
  Bug 2017.
  Steven fixed, I tested.
........
  r2887 | garyo | 2008-04-20 17:44:46 -0700 (Sun, 20 Apr 2008) | 1 line

  Added this in two sections; simple one when discussing simple builds, and an example in the VariantDir section showing how it still works there.
........
  r2888 | stevenknight | 2008-04-20 21:33:01 -0700 (Sun, 20 Apr 2008) | 4 lines

  Accomodate test/MSVC/msvc.py's reliance on the Windows Platform SDK
  (for now) by making use of the user's %INCLUDE% and %LIB% variables.
  Split some independent embedded subtests into their own test scripts.
........
  r2889 | stevenknight | 2008-04-20 21:38:05 -0700 (Sun, 20 Apr 2008) | 2 lines

  Windows portability fix (line endings).
........
  r2890 | stevenknight | 2008-04-20 21:44:24 -0700 (Sun, 20 Apr 2008) | 2 lines

  Update Windows portion of if:-elif: block for a variable name change.
........
  r2891 | stevenknight | 2008-04-20 21:52:41 -0700 (Sun, 20 Apr 2008) | 3 lines

  On Windows, escape backslashes on the --interactive command line input,
  so people can build targets in other directories.
........
  r2892 | stevenknight | 2008-04-20 21:56:50 -0700 (Sun, 20 Apr 2008) | 3 lines

  Fix ripple effects on Windows from redefining how $CXXFLAGS gets
  added to C++ command lines.
........
  r2893 | stevenknight | 2008-04-20 22:04:50 -0700 (Sun, 20 Apr 2008) | 4 lines

  Handle a ripple effect from redefining the file() and open() builtin
  functions by explicitly restoring the originals whenever we reset
  the global state between tests.
........
  r2894 | stevenknight | 2008-04-20 23:17:23 -0700 (Sun, 20 Apr 2008) | 2 lines

  Remove by-hand backslash escaping, now that --interactive mode is handling it.
........
  r2895 | stevenknight | 2008-04-20 23:23:04 -0700 (Sun, 20 Apr 2008) | 2 lines

  Mention the fix for the Fortran suffix out-of-memory bug
........

1 files changed, 7 insertions, 12 deletions

diff --git a/test/NodeOps.py b/test/NodeOps.py
index d00f726af..ffaeb622d 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -52,15 +52,13 @@ if string.find(sys.platform, 'irix') > -1:
 
 test = TestSCons.TestSCons()
 
-e = test.Environment()
-fooflags = e['SHCXXFLAGS'] + ' -DFOO'
-barflags = e['SHCXXFLAGS'] + ' -DBAR'
-
 test.subdir('bld', 'src', ['src', 'subsrcdir'])
 
 sconstruct = r"""
-foo = Environment(SHOBJPREFIX='', SHCXXFLAGS = '%(fooflags)s', WINDOWS_INSERT_DEF=1)
-bar = Environment(SHOBJPREFIX='', SHCXXFLAGS = '%(barflags)s', WINDOWS_INSERT_DEF=1)
+foo = Environment(SHOBJPREFIX='', WINDOWS_INSERT_DEF=1)
+foo.Append(SHCXXFLAGS = '-DFOO')
+bar = Environment(SHOBJPREFIX='', WINDOWS_INSERT_DEF=1)
+bar.Append(SHCXXFLAGS = '-DBAR')
 src = Dir('src')
 VariantDir('bld', src, duplicate=1)
 Nodes=[]
@@ -90,11 +88,9 @@ gooMain = foo.Clone(LIBS='goo', LIBPATH='bld')
 goo_obj = gooMain.Object(target='goomain', source='main.c')
 gooMain.Program(target='gooprog', source=goo_obj)
 """
-           
 
 test.write('foo.def', r"""
 LIBRARY        "foo"
-DESCRIPTION    "Foo Shared Library"
 
 EXPORTS
    doIt
@@ -102,7 +98,6 @@ EXPORTS
 
 test.write('bar.def', r"""
 LIBRARY        "bar"
-DESCRIPTION    "Bar Shared Library"
 
 EXPORTS
    doIt
@@ -153,8 +148,9 @@ def exists_test(node):
             import sys
             sys.stderr.write('VariantDir exists() population did not occur! (%%s:%%s,%%s,%%s)\n'%%(str(node),before,via_node,after))
             sys.exit(-2)
-    
-goo = Environment(CPPFLAGS = '%(fooflags)s')
+
+goo = Environment()
+goo.Append(CFLAGS = '-DFOO')
 goof_in = File('goof.in')
 if %(_E)s:
     exists_test(goof_in)
@@ -192,7 +188,6 @@ boo_sub()
 """)
 
 test.write('main.c', r"""
-
 void doIt();
 
 int