diff options
| author | Steven Knight <knight@baldmt.com> | 2007-05-18 05:40:31 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2007-05-18 05:40:31 +0000 |
| commit | 5993d73eea5e12f11bf7f0e5cd7abdaae8035b0d (patch) | |
| tree | 4d532be0f91384214c930e1150d7e6becd44a92d /test/import.py | |
| parent | cc97c51b27ab556821c2714b71658333ebf6027f (diff) | |
| download | scons-5993d73eea5e12f11bf7f0e5cd7abdaae8035b0d.tar.gz | |
Merged revisions 1884-1905 via svnmerge from0.97
http://scons.tigris.org/svn/scons/branches/core
........
r1891 | stevenknight | 2007-04-24 08:57:03 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D632 - Fix 0.96.96 reference count regression during parallel builds.
........
r1892 | stevenknight | 2007-04-24 12:51:05 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D633 - Fix documented default value(s) of $MSVS_USE_MFC_DIRS.
........
r1893 | stevenknight | 2007-04-24 16:12:14 -0500 (Tue, 24 Apr 2007) | 1 line
0.96.D634 - Make the DirEntryScanner tolerant of non-Dir nodes.
........
r1898 | stevenknight | 2007-05-09 15:07:15 -0500 (Wed, 09 May 2007) | 1 line
0.96.D635 - Portability fixes in test scripts.
........
r1899 | stevenknight | 2007-05-12 08:19:13 -0500 (Sat, 12 May 2007) | 1 line
0.96.D636 - Update documentation with rudimentary Tool module descriptions.
........
r1901 | stevenknight | 2007-05-17 14:32:14 -0500 (Thu, 17 May 2007) | 1 line
0.97.D001 - Initialize 0.97 for release.
........
Diffstat (limited to 'test/import.py')
| -rw-r--r-- | test/import.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/import.py b/test/import.py index d267f00d..7debffc3 100644 --- a/test/import.py +++ b/test/import.py @@ -143,11 +143,12 @@ tools = [ 'zip', ] -if sys.platform == 'win32': - tools.extend([ - '386asm', - 'linkloc', - ]) +#if sys.platform == 'win32': +# Just comment out (for now?) due to registry dependency. +# tools.extend([ +# '386asm', +# 'linkloc', +# ]) # Intel no compiler warning.. intel_no_compiler_warning = """ |