Merged revisions 1826-1882 via svnmerge from

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

........
  r1828 | stevenknight | 2007-02-12 13:29:17 -0600 (Mon, 12 Feb 2007) | 1 line

  0.96.D588 - Speed up Builder suffix-matching.
........
  r1829 | stevenknight | 2007-02-14 08:12:32 -0600 (Wed, 14 Feb 2007) | 1 line

  0.96.D589 - The scons command, branch 0.96.94.
........
  r1830 | stevenknight | 2007-02-14 09:49:44 -0600 (Wed, 14 Feb 2007) | 1 line

  0.96.D590 - Fix the scons-doc .tar.gz file packaging.
........
  r1835 | stevenknight | 2007-02-15 11:03:20 -0600 (Thu, 15 Feb 2007) | 1 line

  0.96.D591 - Update the release HOWTO.
........
  r1836 | stevenknight | 2007-02-15 13:39:24 -0600 (Thu, 15 Feb 2007) | 1 line

  0.96.D592 - The scons command, branch 0.96.95.
........
  r1837 | stevenknight | 2007-02-15 18:34:18 -0600 (Thu, 15 Feb 2007) | 1 line

  0.96.D593 - Back out (comment out) Windows registry installer changes.
........
  r1838 | stevenknight | 2007-02-16 10:37:28 -0600 (Fri, 16 Feb 2007) | 1 line

  0.96.D594 - Update Debian packaging to remove hard-coded references to Python 2.2. (Jean-Baptiste Lab)
........
  r1839 | stevenknight | 2007-02-20 09:34:23 -0600 (Tue, 20 Feb 2007) | 1 line

  0.96.D595 - Documentation fixes. In the construction variable appendix, use cross-referenced links to entries.
........
  r1840 | stevenknight | 2007-02-21 05:11:35 -0600 (Wed, 21 Feb 2007) | 1 line

  0.96.D596 - Handle Java '.class' attributes after non-word tokens without assuming it introduces an inner class.
........
  r1841 | stevenknight | 2007-02-21 22:33:28 -0600 (Wed, 21 Feb 2007) | 1 line

  0.96.D597 - CPPDEFINES regression
........
  r1842 | stevenknight | 2007-02-22 14:19:10 -0600 (Thu, 22 Feb 2007) | 1 line

  0.96.D598 - Do not detect a Java anonymous class when the first non-skipped token after "new" is a closing brace.
........
  r1843 | stevenknight | 2007-02-23 10:45:06 -0600 (Fri, 23 Feb 2007) | 1 line

  0.96.D599 - Better [Errno 21] Is a directory error message.
........
  r1844 | stevenknight | 2007-02-23 13:32:11 -0600 (Fri, 23 Feb 2007) | 1 line

  0.96.D600 - Fix expansion of non-Node objects within a PathList (maximum recursion / unhashable type bug).
........
  r1847 | stevenknight | 2007-03-02 00:12:27 -0600 (Fri, 02 Mar 2007) | 1 line

  0.96.D601 - Generate SCons API documentation from the docstrings using epydoc.
........
  r1848 | stevenknight | 2007-03-02 14:10:06 -0600 (Fri, 02 Mar 2007) | 1 line

  0.96.D602 - Fix use of custom include and lib paths with Visual Studio 8. (Richard Viney)
........
  r1849 | stevenknight | 2007-03-03 01:00:22 -0600 (Sat, 03 Mar 2007) | 1 line

  0.96.D603 - Man page fix: ParseDepends(). User's Guide updates: NoCache(), Clean(), fix CPPDEFINES output, markers for to-be-documented features, white space clean-up.
........
  r1850 | stevenknight | 2007-03-06 02:29:08 -0600 (Tue, 06 Mar 2007) | 1 line

  0.96.D604 - Fix use of --debug=presub with the Actions for our out-of-the-box Builders.
........
  r1851 | stevenknight | 2007-03-06 09:10:43 -0600 (Tue, 06 Mar 2007) | 1 line

  0.96.D605 - User Guide updates: --random, AlwaysBuild(), --tree=, --debug=presub, --debug=stacktrace.
........
  r1852 | stevenknight | 2007-03-06 15:38:06 -0600 (Tue, 06 Mar 2007) | 1 line

  0.96.D606 - Have the Intel toolchain use the default smart linking logic. (Dmitry Grigorenko and Gary Oberbrunner)
........
  r1853 | stevenknight | 2007-03-06 17:56:44 -0600 (Tue, 06 Mar 2007) | 1 line

  0.96.D607 - Fix tests: ActionTests.py for presub change, command detection in test/Intel/icpc-link.py.
........
  r1854 | stevenknight | 2007-03-08 09:35:25 -0600 (Thu, 08 Mar 2007) | 1 line

  0.96.D608 - Better selection of .NET Framework SDK paths. (Richard Viney)
........
  r1855 | stevenknight | 2007-03-08 10:34:37 -0600 (Thu, 08 Mar 2007) | 1 line

  0.96.D609 - Don't re-run TeX if the triggering strings (\makeindex, \bibliography, \tableofcontents) are commented out. (Matthias Troffaes)
........
  r1856 | stevenknight | 2007-03-09 16:18:36 -0600 (Fri, 09 Mar 2007) | 1 line

  0.96.D610 - Teach the new PathList module to handle nested lists within CPPPATH and the like.
........
  r1857 | stevenknight | 2007-03-10 23:30:29 -0600 (Sat, 10 Mar 2007) | 1 line

  0.96.D611 - Qt builders_used failure.
........
  r1858 | stevenknight | 2007-03-11 15:33:34 -0500 (Sun, 11 Mar 2007) | 1 line

  0.96.D612 - Document limitations of --implicit-cache w.r.t. CPPPATH/LIBPATH/etc.
........
  r1859 | stevenknight | 2007-03-11 21:11:26 -0500 (Sun, 11 Mar 2007) | 1 line

  0.96.D613 - Document --debug=findlibs and --taskmastertrace in the User's Guide.
........
  r1860 | stevenknight | 2007-03-12 13:28:42 -0500 (Mon, 12 Mar 2007) | 1 line

  0.96.D614 - Remove deleted cons file from the User's Guide MANIFEST. Fix epydoc API build if the build directory is outside the current directory.
........
  r1861 | stevenknight | 2007-03-13 13:03:56 -0500 (Tue, 13 Mar 2007) | 2 lines

  Ignore '*.pyc' files in the compat/ subdirectory.
........
  r1862 | stevenknight | 2007-03-13 19:08:19 -0500 (Tue, 13 Mar 2007) | 1 line

  0.96.D615 - Fix use of $VAR expansions within CPPPATH/LIBPATH values when the expansion is itself a Dir node concatenated with a string.
........
  r1866 | stevenknight | 2007-03-16 01:46:10 -0500 (Fri, 16 Mar 2007) | 1 line

  0.96.D616 - Back off to the 0.96.94 of Builder.py (with some performance improvements).
........
  r1867 | stevenknight | 2007-03-16 11:20:39 -0500 (Fri, 16 Mar 2007) | 1 line

  0.96.D617 - Fix an unnamed variable error if we can't map the Visual Studio version to a default framework version.
........
  r1868 | stevenknight | 2007-03-16 12:08:18 -0500 (Fri, 16 Mar 2007) | 1 line

  0.96.D618 - Quote the MSVS build target in command lines to handle spaces target name. (Jeff Mahovsky)
........
  r1869 | stevenknight | 2007-03-16 13:30:06 -0500 (Fri, 16 Mar 2007) | 1 line

  0.96.D619 - Portability fixes for tests run on Windows.
........
  r1870 | stevenknight | 2007-03-20 00:18:04 -0500 (Tue, 20 Mar 2007) | 1 line

  0.96.D620 - Windows portability fixes: test scripts and infrastructure, detect vcexpress.exe.
........
  r1871 | garyo | 2007-03-21 18:32:54 -0500 (Wed, 21 Mar 2007) | 1 line

  Fix bug where site_scons dir was added to sys.path as relative, not absolute.  Added test case.  Bug reported by Timothy Woods; thanks for the test case!
........
  r1872 | stevenknight | 2007-03-22 09:43:23 -0500 (Thu, 22 Mar 2007) | 1 line

  0.96.D622 - Add mention of site_scons fix to src/CHANGES.txt.
........
  r1873 | stevenknight | 2007-04-02 23:49:36 -0500 (Mon, 02 Apr 2007) | 1 line

  0.96.D623 - Parallel build dependencies with multiple entries in children. (Adam Simpkins)
........
  r1874 | stevenknight | 2007-04-04 07:45:05 -0500 (Wed, 04 Apr 2007) | 1 line

  0.96.D624 - Make all necessary LaTeX auxiliary files Precious, so bibliography contents aren't affected by whether the auxiliary files exist or not. (Joel B. Mohler)
........
  r1875 | stevenknight | 2007-04-04 13:15:39 -0500 (Wed, 04 Apr 2007) | 1 line

  0.96.D625 - Fix --debug-time value when -j option is used.
........
  r1876 | stevenknight | 2007-04-09 19:40:08 -0500 (Mon, 09 Apr 2007) | 1 line

  0.96.D626 - Fix man page example of propagating external user environment. Eliminate cut-and-paste sentence in NoCache() description. (Helmut Grohne, Joe Bloggs) [Issue 1626] [Issue 1627]
........
  r1877 | stevenknight | 2007-04-09 23:20:14 -0500 (Mon, 09 Apr 2007) | 1 line

  0.96.D627 - Re-run latex after bibtex runs. (Rob Managan)
........
  r1878 | stevenknight | 2007-04-11 23:38:17 -0500 (Wed, 11 Apr 2007) | 1 line

  0.96.D628 - Fix typo in the User's Guide. [issue 1600]
........
  r1879 | stevenknight | 2007-04-12 01:06:35 -0500 (Thu, 12 Apr 2007) | 1 line

  0.96.D629 - Avoid name conflicts with compat/ modules (specifically _subprocess.py).
........
  r1880 | stevenknight | 2007-04-12 01:33:42 -0500 (Thu, 12 Apr 2007) | 1 line

  0.96.D630 - Portability fixes and other improvements in test scripts.
........
  r1882 | stevenknight | 2007-04-13 16:42:02 -0500 (Fri, 13 Apr 2007) | 1 line

  0.96.D631 - The scons command, branch 0.96.96.
........

1 files changed, 29 insertions, 34 deletions

diff --git a/test/gnutools.py b/test/gnutools.py
index 4bcea00..2180217 100644
--- a/test/gnutools.py
+++ b/test/gnutools.py
@@ -31,10 +31,13 @@ Testing the gnu tool chain, i.e. the tools 'gcc', 'g++' and 'gnulink'.
 import TestSCons
 import string
 import sys
+
 _python_ = TestSCons._python_
 _exe = TestSCons._exe
-_dll = TestSCons._dll
-dll_ = TestSCons.dll_
+
+def dll(s):
+    return TestSCons.dll_ + s + TestSCons._dll
+
 test = TestSCons.TestSCons()
 
 test.subdir('gnutools')
@@ -111,40 +114,32 @@ env.SharedLibrary('c-and-cpp', Split('cfile1.c cppfile1.cpp'))
 
 test.run(chdir='work1')
 
-def testObject(test, obj, command, flags):
+def testObject(test, obj, expect):
     contents = test.read(test.workpath('work1', obj))
     line1 = string.split(contents,'\n')[0]
-    items = string.split(line1, ' ')
-    cmd = ''
-    for i in items:
-        if i != '':
-            if cmd:
-                cmd = cmd + ' ' + i
-            else:
-                cmd = i
-    res = ((flags and (cmd == command + ' ' + flags)) or
-           (not flags and (cmd == command)))
-    if not res: print "'"+obj+command+flags+"'"+"!='"+str(line1)+"'"
-    return res
-
-if sys.platform == 'cygwin':
-    fpic = ''
+    actual = string.join(string.split(line1))
+    if not expect == actual:
+        print "%s:  %s != %s\n" % (obj, repr(expect), repr(actual))
+        test.fail_test()
+
+if sys.platform in ('win32', 'cygwin'):
+    c_fpic = ''
 else:
-    fpic = ' -fPIC'
-
-test.fail_test(not testObject(test, 'cfile1.o', 'gcc', '-c') or
-               not testObject(test, 'cfile2.o', 'gcc', '-c') or
-               not testObject(test, 'cppfile1.o', 'g++', '-c') or
-               not testObject(test, 'cppfile2.o', 'g++', '-c') or
-               not testObject(test, 'cfile1.os', 'gcc', '-c' + fpic) or
-               not testObject(test, 'cfile2.os', 'gcc', '-c' + fpic) or
-               not testObject(test, 'cppfile1.os', 'g++', '-c' + fpic) or
-               not testObject(test, 'cppfile2.os', 'g++', '-c' + fpic) or
-               not testObject(test, 'c-only' + _exe, 'gcc', '') or
-               not testObject(test, 'cpp-only' + _exe, 'g++', '') or
-               not testObject(test, 'c-and-cpp' + _exe, 'g++', '') or
-               not testObject(test, dll_ + 'c-only' + _dll, 'gcc', '-shared') or
-               not testObject(test, dll_ + 'cpp-only' + _dll, 'g++', '-shared') or
-               not testObject(test, dll_ + 'c-and-cpp' + _dll, 'g++', '-shared'))
+    c_fpic = ' -fPIC'
+
+testObject(test, 'cfile1.o',            'gcc -c')
+testObject(test, 'cfile2.o',            'gcc -c')
+testObject(test, 'cppfile1.o',          'g++ -c')
+testObject(test, 'cppfile2.o',          'g++ -c')
+testObject(test, 'cfile1.os',           'gcc -c' + c_fpic)
+testObject(test, 'cfile2.os',           'gcc -c' + c_fpic)
+testObject(test, 'cppfile1.os',         'g++ -c -fPIC')
+testObject(test, 'cppfile2.os',         'g++ -c -fPIC')
+testObject(test, 'c-only' + _exe,       'gcc')
+testObject(test, 'cpp-only' + _exe,     'g++')
+testObject(test, 'c-and-cpp' + _exe,    'g++')
+testObject(test, dll('c-only'),         'gcc -shared')
+testObject(test, dll('cpp-only'),       'g++ -shared')
+testObject(test, dll('c-and-cpp'),      'g++ -shared')
 
 test.pass_test()