Eliminate unnecessary WIN32/Win32/win32 references in tests, too.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1414 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/BuildDir/errors.py b/test/BuildDir/errors.py
index 93cd3ecedec313be9984b2da0b93f54aa241afb9..285b996c17c62e700d564d05c2283b921389f2ae 100644 (file)
--- a/test/BuildDir/errors.py
+++ b/test/BuildDir/errors.py
@@ -83,7 +83,7 @@ test.run(chdir = 'normal', arguments = ".")
 test.fail_test(test.read(['normal', 'build', 'file.out']) != "normal/src/file.in\n")
 
 # Verify the error when the BuildDir itself is read-only.  Don't bother
-# to test this on Win32, because the ACL (I think) still allows the
+# to test this on Windows, because the ACL (I think) still allows the
 # owner to create files in the directory even when it's read-only.
 if sys.platform != 'win32':
     dir = os.path.join('ro-dir', 'build')

diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py
index a830058f3e9463206de76610dece2b6fcf6651dc..1f4fd3dec42fdaf8dad9d3bf1a8a3f8ec96a52ed 100644 (file)
--- a/test/CC/SHCCFLAGS.py
+++ b/test/CC/SHCCFLAGS.py
@@ -44,8 +44,8 @@ if string.find(sys.platform, 'irix') > -1:
     os.environ['LD_LIBRARYN32_PATH'] = '.'
 
 test.write('SConstruct', """
-foo = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1)
-bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1)
+foo = Environment(SHCCFLAGS = '%s', WINDOWS_INSERT_DEF=1)
+bar = Environment(SHCCFLAGS = '%s', WINDOWS_INSERT_DEF=1)
 
 foo_obj = foo.SharedObject(target = 'foo', source = 'prog.c')
 foo.SharedLibrary(target = 'foo', source = foo_obj)
@@ -109,7 +109,7 @@ test.run(program = test.workpath('fooprog'), stdout = "prog.c:  FOO\n")
 test.run(program = test.workpath('barprog'), stdout = "prog.c:  BAR\n")
 
 test.write('SConstruct', """
-bar = Environment(SHCCFLAGS = '%s', WIN32_INSERT_DEF=1)
+bar = Environment(SHCCFLAGS = '%s', WINDOWS_INSERT_DEF=1)
 
 foo_obj = bar.SharedObject(target = 'foo', source = 'prog.c')
 bar.SharedLibrary(target = 'foo', source = foo_obj)

diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py
index 049be6cf895fe41d3cfad932697b4bd025b94f93..88da443d149d41594e139d38c1370bf33e5741b0 100644 (file)
--- a/test/CXX/SHCXXFLAGS.py
+++ b/test/CXX/SHCXXFLAGS.py
@@ -46,8 +46,8 @@ if string.find(sys.platform, 'irix') > -1:
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """
-foo = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1)
-bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1)
+foo = Environment(SHCXXFLAGS = '%s', WINDOWS_INSERT_DEF=1)
+bar = Environment(SHCXXFLAGS = '%s', WINDOWS_INSERT_DEF=1)
 foo.SharedObject(target = 'foo%s', source = 'prog.cpp')
 bar.SharedObject(target = 'bar%s', source = 'prog.cpp')
 foo.SharedLibrary(target = 'foo', source = 'foo%s')
@@ -111,7 +111,7 @@ test.run(program = test.workpath('fooprog'), stdout = "prog.cpp:  FOO\n")
 test.run(program = test.workpath('barprog'), stdout = "prog.cpp:  BAR\n")
 
 test.write('SConstruct', """
-bar = Environment(SHCXXFLAGS = '%s', WIN32_INSERT_DEF=1)
+bar = Environment(SHCXXFLAGS = '%s', WINDOWS_INSERT_DEF=1)
 bar.SharedObject(target = 'foo%s', source = 'prog.cpp')
 bar.SharedObject(target = 'bar%s', source = 'prog.cpp')
 bar.SharedLibrary(target = 'foo', source = 'foo%s')

diff --git a/test/Chmod.py b/test/Chmod.py
index 45245f210f1d9c9df786e4b86348ea6699b8ee38..eb0b6c149301cf1d82e2f1dac69d8f6bd4835293 100644 (file)
--- a/test/Chmod.py
+++ b/test/Chmod.py
@@ -36,7 +36,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-# Note:  Win32 basically has two modes that it can os.chmod() files to
+# Note:  Windows basically has two modes that it can os.chmod() files to
 # 0444 and 0666, and directories to 0555 and 0777, so we can only really
 # oscillate between those values.
 test.write('SConstruct', """

diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index af8babc6ed4222707bd776e727eb21cda0c31006..6f3f986ad40dfcbc9f92b437a270868d1f5c2e88 100644 (file)
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -63,7 +63,7 @@ import os.path
 
 Import('env')
 
-local = env.Copy(WIN32_INSERT_DEF = 1)
+local = env.Copy(WINDOWS_INSERT_DEF = 1)
 
 barsrc = [
     'BarObject.cpp',

diff --git a/test/NodeOps.py b/test/NodeOps.py
index 55f35576f2511b7df9826a49d49d105965f921b1..9f548c41ff53103e02927d95b72108e7aaaebac1 100644 (file)
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -65,8 +65,8 @@ test = TestSCons.TestSCons()
 test.subdir('bld', 'src', ['src', 'subsrcdir'])
 
 sconstruct = r"""
-foo = Environment(SHCXXFLAGS = '%(fooflags)s', WIN32_INSERT_DEF=1)
-bar = Environment(SHCXXFLAGS = '%(barflags)s', WIN32_INSERT_DEF=1)
+foo = Environment(SHCXXFLAGS = '%(fooflags)s', WINDOWS_INSERT_DEF=1)
+bar = Environment(SHCXXFLAGS = '%(barflags)s', WINDOWS_INSERT_DEF=1)
 src = Dir('src')
 BuildDir('bld', src, duplicate=1)
 Nodes=[]

diff --git a/test/PharLap.py b/test/PharLap.py
index 561200872f45e6cb4d3a05891eb0e49c1ceea68b..c8353f4370b8d4eec156f253fb1e46e7a17853c1 100644 (file)
--- a/test/PharLap.py
+++ b/test/PharLap.py
@@ -34,7 +34,7 @@ import time
 test = TestSCons.TestSCons()
 
 if sys.platform != 'win32':
-    test.skip_test('PharLap is only available on win32; skipping test.\n')
+    test.skip_test('PharLap is only available on Windows; skipping test.\n')
 
 if not test.detect_tool('linkloc'):
     test.skip_test("Could not find 'linkloc', skipping test.\n")
@@ -294,7 +294,7 @@ env.Program(target='minasm', source='minasm.asm')
 
 test.run(arguments='.')
 
-# Assume .exe extension...this test is for Win32 only.
+# Assume .exe extension...this test is for Windows only.
 test.fail_test(not os.path.exists('minasm.exe'))
 test.up_to_date(arguments='.')
 

diff --git a/test/SHELL.py b/test/SHELL.py
index 9082dbd003be1d0299946b639b0f457e9a82f6cb..7dda321ca40c7b92074e51be1be50d5f71af920f 100644 (file)
--- a/test/SHELL.py
+++ b/test/SHELL.py
@@ -39,7 +39,7 @@ python = TestSCons.python
 test = TestSCons.TestSCons()
 
 if sys.platform == 'win32':
-    sys.stderr.write('Cannot set SHELL separately from other variables on win32.\n')
+    sys.stderr.write('Cannot set SHELL separately from other variables on Windows.\n')
     test.no_result(1)
 
 my_shell = test.workpath('my_shell.py')

diff --git a/test/SharedLibrary.py b/test/SharedLibrary.py
index 72f87701792dce070b98ed3a95ee53af52834e49..d9b035099937347764460ee7da857ab45e7da044 100644 (file)
--- a/test/SharedLibrary.py
+++ b/test/SharedLibrary.py
@@ -35,7 +35,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', """
 import sys
-env=Environment(WIN32_INSERT_DEF=1)
+env=Environment(WINDOWS_INSERT_DEF=1)
 env2 = Environment(LIBS = [ 'foo1', 'foo2', 'foo3' ],
                    LIBPATH = [ '.' ])
 env.SharedLibrary(target = 'foo1', source = 'f1.c')
@@ -45,7 +45,7 @@ else:
     env.StaticLibrary(target = 'foo1', source = 'f1.c')
 SharedLibrary(target = 'foo2',
               source = Split('f2a.c f2b.c f2c.c'),
-              WIN32_INSERT_DEF = 1)
+              WINDOWS_INSERT_DEF = 1)
 env.SharedLibrary(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
 env2.Program(target = 'prog', source = 'prog.c')
 """)
@@ -223,11 +223,11 @@ test.run(arguments = '-f SConstructFoo2',
 
 if sys.platform == 'win32':
     # Make sure we don't insert a .def source file (when
-    # WIN32_INSERT_DEF is set) and a .lib target file if
+    # WINDOWS_INSERT_DEF is set) and a .lib target file if
     # they're specified explicitly.
 
     test.write('SConstructBar', '''
-env = Environment(WIN32_INSERT_DEF=1)
+env = Environment(WINDOWS_INSERT_DEF=1)
 env2 = Environment(LIBS = [ 'foo4' ],
                    LIBPATH = [ '.' ])
 env.SharedLibrary(target = ['foo4', 'foo4.lib'], source = ['f4.c', 'foo4.def'])

diff --git a/test/bad-drive.py b/test/bad-drive.py
index 35b3b38436b603461fcd9e62f3c511bbd825360c..4c081a56ea08744afcbb305983efb90a09a30947 100644 (file)
--- a/test/bad-drive.py
+++ b/test/bad-drive.py
@@ -52,7 +52,7 @@ for i in range(len(string.uppercase)-1, -1, -1):
 
 if bad_drive is None:
     print "All drive letters appear to be in use."
-    print "Cannot test SCons handling of invalid Win32 drive letters."
+    print "Cannot test SCons handling of invalid Windows drive letters."
     test.no_result(1);
 
 test.write('SConstruct', """

diff --git a/test/mingw.py b/test/mingw.py
index ba6add87989518e56837ade993842abc4716a256..fac89106fbd0012ca74d438038ef7acf33d05ce2 100644 (file)
--- a/test/mingw.py
+++ b/test/mingw.py
@@ -38,7 +38,7 @@ import string
 
 test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
 
-# MinGW is win32 only:
+# MinGW is Windows only:
 if sys.platform != 'win32':
     msg = "Skipping mingw test on non-Windows platform '%s'\n" % sys.platform
     test.skip_test(msg)

diff --git a/test/option-v.py b/test/option-v.py
index 6a0aaf72b0130035946ae9544f670f3a8950bed9..28fe8ca6b95fa3d7d27a2cc273da8ee694ae8ae3 100644 (file)
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -33,7 +33,7 @@ test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 test.write('SConstruct', "")
 
-# Win32 may or may not print a line for the script version
+# Windows may or may not print a line for the script version
 # depending on whether it's invoked through scons.py or scons.bat.
 expect1 = r"""SCons by Steven Knight et al.:
 \tengine: v\S+, [^,]*, by \S+ on \S+

diff --git a/test/scan-once.py b/test/scan-once.py
index 90af11edc06cc9f3c814133de7b4272f8de034d3..c86eaa498282dd4ce395945037a77f78485127ed 100644 (file)
--- a/test/scan-once.py
+++ b/test/scan-once.py
@@ -253,7 +253,7 @@ env = env.Copy()    # Yes, clobber intentionally
 Mylib.AddCFlags(env, "-DGOOFY_DEMO")
 Mylib.AddIncludeDirs(env, ".")
 
-# Not part of SLF's original stuff: On Win32, it's import to use the
+# Not part of SLF's original stuff: On Windows, it's import to use the
 # original test environment when we invoke SCons recursively.
 import os
 recurse_env = env.Copy()