Remove win32 platform specification (i.e., platform = 'win32') from MSVS test Environments.

9 files changed, 24 insertions, 17 deletions

diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py
index 7045daa..3f99d65 100644
--- a/test/MSVS/vs-6.0-clean.py
+++ b/test/MSVS/vs-6.0-clean.py
@@ -41,8 +41,9 @@ expected_dspfile = TestSConsMSVS.expected_dspfile_6_0
 expected_dswfile = TestSConsMSVS.expected_dswfile_6_0
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'],
-                MSVS_VERSION='6.0',HOST_ARCH='%(HOST_ARCH)s')
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='6.0',
+                HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test.c']
 testincs = ['sdk.h']
diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py
index 91a8cb2..627c5ad 100644
--- a/test/MSVS/vs-7.0-clean.py
+++ b/test/MSVS/vs-7.0-clean.py
@@ -41,7 +41,7 @@ expected_slnfile = TestSConsMSVS.expected_slnfile_7_0
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_0
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'],
+env=Environment(tools=['msvs'],
                 MSVS_VERSION='7.0',
                 HOST_ARCH='%(HOST_ARCH)s')
 
diff --git a/test/MSVS/vs-7.0-scc-files.py b/test/MSVS/vs-7.0-scc-files.py
index bb45e55..2c5c520 100644
--- a/test/MSVS/vs-7.0-scc-files.py
+++ b/test/MSVS/vs-7.0-scc-files.py
@@ -41,14 +41,15 @@ test._msvs_versions = ['7.0']
 expected_slnfile = TestSConsMSVS.expected_slnfile_7_0
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_0
 SConscript_contents = \
-r"""env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0',
-                CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
-                CPPPATH=['inc1', 'inc2'],
-                MSVS_SCC_CONNECTION_ROOT='.',
-                MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM',
-                MSVS_SCC_PROJECT_NAME='Perforce Project',
-                MSVS_SCC_AUX_PATH='AUX',
-                HOST_ARCH='%(HOST_ARCH)s')
+r"""env=Environment(tools=['msvs'],
+                    MSVS_VERSION='7.0',
+                    CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
+                    CPPPATH=['inc1', 'inc2'],
+                    MSVS_SCC_CONNECTION_ROOT='.',
+                    MSVS_SCC_PROVIDER='MSSCCI:Perforce SCM',
+                    MSVS_SCC_PROJECT_NAME='Perforce Project',
+                    MSVS_SCC_AUX_PATH='AUX',
+                    HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
diff --git a/test/MSVS/vs-7.0-scc-legacy-files.py b/test/MSVS/vs-7.0-scc-legacy-files.py
index d6eb247..00ce397 100644
--- a/test/MSVS/vs-7.0-scc-legacy-files.py
+++ b/test/MSVS/vs-7.0-scc-legacy-files.py
@@ -41,7 +41,8 @@ test._msvs_versions = ['7.0']
 expected_slnfile = TestSConsMSVS.expected_slnfile_7_0
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_0
 SConscript_contents = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0',
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='7.0',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
                 CPPPATH=['inc1', 'inc2'],
                 MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects',
diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py
index 515a9e6..403463e 100644
--- a/test/MSVS/vs-7.1-clean.py
+++ b/test/MSVS/vs-7.1-clean.py
@@ -41,7 +41,7 @@ expected_slnfile = TestSConsMSVS.expected_slnfile_7_1
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_1
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'],
+env=Environment(tools=['msvs'],
                 MSVS_VERSION='7.1',
                 HOST_ARCH='%(HOST_ARCH)s')
 
diff --git a/test/MSVS/vs-7.1-scc-files.py b/test/MSVS/vs-7.1-scc-files.py
index 9fdf5e1..4f253e7 100644
--- a/test/MSVS/vs-7.1-scc-files.py
+++ b/test/MSVS/vs-7.1-scc-files.py
@@ -41,7 +41,8 @@ test._msvs_versions = ['7.1']
 expected_slnfile = TestSConsMSVS.expected_slnfile_7_1
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_1
 SConscript_contents = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1',
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='7.1',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
                 CPPPATH=['inc1', 'inc2'],
                 MSVS_SCC_CONNECTION_ROOT='.',
diff --git a/test/MSVS/vs-7.1-scc-legacy-files.py b/test/MSVS/vs-7.1-scc-legacy-files.py
index 8bb6b96..96ec21d 100644
--- a/test/MSVS/vs-7.1-scc-legacy-files.py
+++ b/test/MSVS/vs-7.1-scc-legacy-files.py
@@ -41,7 +41,8 @@ test._msvs_versions = ['7.1']
 expected_slnfile = TestSConsMSVS.expected_slnfile_7_1
 expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_1
 SConscript_contents = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1',
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='7.1',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
                 CPPPATH=['inc1', 'inc2'],
                 MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects',
diff --git a/test/MSVS/vs-scc-files.py b/test/MSVS/vs-scc-files.py
index 2c16da2..4e79e27 100644
--- a/test/MSVS/vs-scc-files.py
+++ b/test/MSVS/vs-scc-files.py
@@ -48,7 +48,8 @@ for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions():
     expected_slnfile = test.get_expected_sln_file_contents(vc_version, project_file)
     expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file)
     SConscript_contents = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='{vc_version}',
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='{vc_version}',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
                 CPPPATH=['inc1', 'inc2'],
                 MSVS_SCC_CONNECTION_ROOT='.',
diff --git a/test/MSVS/vs-scc-legacy-files.py b/test/MSVS/vs-scc-legacy-files.py
index 7badd61..9943d3d 100644
--- a/test/MSVS/vs-scc-legacy-files.py
+++ b/test/MSVS/vs-scc-legacy-files.py
@@ -49,7 +49,8 @@ for vc_version in TestSConsMSVS.get_tested_proj_file_vc_versions():
     expected_vcprojfile = test.get_expected_proj_file_contents(vc_version, dirs, project_file)
 
     SConscript_contents = """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='{vc_version}',
+env=Environment(tools=['msvs'],
+                MSVS_VERSION='{vc_version}',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
                 CPPPATH=['inc1', 'inc2'],
                 MSVS_SCC_LOCAL_PATH=r'C:\\MyMsVsProjects',