Re-enable tests on non win32 platforms.

This should alter the HOST_ARCH for these tests on non-x86 platforms to x86 and therefore run.

13 files changed, 38 insertions, 62 deletions

diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py
index 8db51897..052acae9 100644
--- a/test/MSVS/vs-6.0-clean.py
+++ b/test/MSVS/vs-6.0-clean.py
@@ -34,10 +34,9 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
+
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
@@ -50,7 +49,8 @@ expected_dswfile = TestSConsMSVS.expected_dswfile_6_0
 
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='6.0')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='6.0',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test.c']
 testincs = ['sdk.h']
@@ -72,7 +72,7 @@ env.MSVSSolution(target = 'Test.dsw',
                  slnguid = '{SLNGUID}',
                  projects = [p],
                  variant = 'Release')
-""")
+"""%{'HOST_ARCH':host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-6.0-files.py b/test/MSVS/vs-6.0-files.py
index 41b579b7..b6ac4f0e 100644
--- a/test/MSVS/vs-6.0-files.py
+++ b/test/MSVS/vs-6.0-files.py
@@ -33,24 +33,19 @@ import TestSConsMSVS
 import sys
 
 
-test = TestSConsMSVS.TestSConsMSVS()
-
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
+test      = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
 
 
-
 expected_dspfile = TestSConsMSVS.expected_dspfile_6_0
 expected_dswfile = TestSConsMSVS.expected_dswfile_6_0
 SConscript_contents = TestSConsMSVS.SConscript_contents_6_0
 
 
-
-test.write('SConstruct', SConscript_contents)
+test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments="Test.dsp")
 
diff --git a/test/MSVS/vs-6.0-variant_dir.py b/test/MSVS/vs-6.0-variant_dir.py
index 71ed3ac3..02bc7e5a 100644
--- a/test/MSVS/vs-6.0-variant_dir.py
+++ b/test/MSVS/vs-6.0-variant_dir.py
@@ -35,15 +35,12 @@ import sys
 
 test = TestSConsMSVS.TestSConsMSVS()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
+host_arch = test.get_vs_host_arch()
+
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['6.0']
 
-
-
 expected_dspfile = TestSConsMSVS.expected_dspfile_6_0
 expected_dswfile = TestSConsMSVS.expected_dswfile_6_0
 SConscript_contents = TestSConsMSVS.SConscript_contents_6_0
@@ -55,7 +52,7 @@ test.write('SConstruct', """\
 SConscript('src/SConscript', variant_dir='build')
 """)
 
-test.write(['src', 'SConscript'], SConscript_contents)
+test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-7.0-clean.py b/test/MSVS/vs-7.0-clean.py
index a6462188..0bb4d628 100644
--- a/test/MSVS/vs-7.0-clean.py
+++ b/test/MSVS/vs-7.0-clean.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
@@ -50,7 +48,8 @@ expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_0
 
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.0')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='7.0',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
@@ -72,7 +71,7 @@ env.MSVSSolution(target = 'Test.sln',
                  slnguid = '{SLNGUID}',
                  projects = [p],
                  variant = 'Release')
-""")
+"""%{'HOST_ARCH':host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index d63b3c84..62d08dcd 100644
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -36,10 +36,8 @@ import sys
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
@@ -52,7 +50,7 @@ SConscript_contents = TestSConsMSVS.SConscript_contents_7_0
 
 
 
-test.write('SConstruct', SConscript_contents)
+test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments="Test.vcproj")
 
diff --git a/test/MSVS/vs-7.0-variant_dir.py b/test/MSVS/vs-7.0-variant_dir.py
index c9c1ec25..878a969a 100644
--- a/test/MSVS/vs-7.0-variant_dir.py
+++ b/test/MSVS/vs-7.0-variant_dir.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.0']
@@ -56,7 +54,7 @@ test.write('SConstruct', """\
 SConscript('src/SConscript', variant_dir='build')
 """)
 
-test.write(['src', 'SConscript'], SConscript_contents)
+test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-7.1-clean.py b/test/MSVS/vs-7.1-clean.py
index 7357b303..bd657a8b 100644
--- a/test/MSVS/vs-7.1-clean.py
+++ b/test/MSVS/vs-7.1-clean.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
@@ -50,7 +48,8 @@ expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_7_1
 
 
 test.write('SConstruct', """\
-env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='7.1')
+env=Environment(platform='win32', tools=['msvs'],
+                MSVS_VERSION='7.1',HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
@@ -72,7 +71,7 @@ env.MSVSSolution(target = 'Test.sln',
                  slnguid = '{SLNGUID}',
                  projects = [p],
                  variant = 'Release')
-""")
+"""%{'HOST_ARCH':host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 4fa06277..1df10f41 100644
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -36,10 +36,8 @@ import sys
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
@@ -52,7 +50,7 @@ SConscript_contents = TestSConsMSVS.SConscript_contents_7_1
 
 
 
-test.write('SConstruct', SConscript_contents)
+test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments="Test.vcproj")
 
diff --git a/test/MSVS/vs-7.1-variant_dir.py b/test/MSVS/vs-7.1-variant_dir.py
index 78afa8af..98640e35 100644
--- a/test/MSVS/vs-7.1-variant_dir.py
+++ b/test/MSVS/vs-7.1-variant_dir.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['7.1']
@@ -56,7 +54,7 @@ test.write('SConstruct', """\
 SConscript('src/SConscript', variant_dir='build')
 """)
 
-test.write(['src', 'SConscript'], SConscript_contents)
+test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-8.0-clean.py b/test/MSVS/vs-8.0-clean.py
index 2ac258cd..249d8a4e 100644
--- a/test/MSVS/vs-8.0-clean.py
+++ b/test/MSVS/vs-8.0-clean.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
@@ -52,7 +50,8 @@ expected_vcprojfile = TestSConsMSVS.expected_vcprojfile_8_0
 test.write('SConstruct', """\
 env=Environment(platform='win32', tools=['msvs'], MSVS_VERSION='8.0',
                 CPPDEFINES=['DEF1', 'DEF2',('DEF3','1234')],
-                CPPPATH=['inc1', 'inc2'])
+                CPPPATH=['inc1', 'inc2'],
+                HOST_ARCH='%(HOST_ARCH)s')
 
 testsrc = ['test1.cpp', 'test2.cpp']
 testincs = ['sdk.h']
@@ -74,7 +73,7 @@ env.MSVSSolution(target = 'Test.sln',
                  slnguid = '{SLNGUID}',
                  projects = [p],
                  variant = 'Release')
-""")
+"""%{'HOST_ARCH': host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py
index cb3dead1..11dfd358 100644
--- a/test/MSVS/vs-8.0-files.py
+++ b/test/MSVS/vs-8.0-files.py
@@ -36,10 +36,8 @@ import sys
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
@@ -52,7 +50,7 @@ SConscript_contents = TestSConsMSVS.SConscript_contents_8_0
 
 
 
-test.write('SConstruct', SConscript_contents)
+test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments="Test.vcproj")
 
diff --git a/test/MSVS/vs-8.0-variant_dir.py b/test/MSVS/vs-8.0-variant_dir.py
index a27cfafd..e5b8c433 100644
--- a/test/MSVS/vs-8.0-variant_dir.py
+++ b/test/MSVS/vs-8.0-variant_dir.py
@@ -34,10 +34,8 @@ import sys
 
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
@@ -56,7 +54,7 @@ test.write('SConstruct', """\
 SConscript('src/SConscript', variant_dir='build')
 """)
 
-test.write(['src', 'SConscript'], SConscript_contents)
+test.write(['src', 'SConscript'], SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments=".")
 
diff --git a/test/MSVS/vs-8.0-x64-files.py b/test/MSVS/vs-8.0-x64-files.py
index 97afcae3..cfad019d 100644
--- a/test/MSVS/vs-8.0-x64-files.py
+++ b/test/MSVS/vs-8.0-x64-files.py
@@ -36,10 +36,9 @@ import sys
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
+host_arch = test.get_vs_host_arch()
+
 
-if sys.platform != 'win32':
-    msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
-    test.skip_test(msg)
 
 # Make the test infrastructure think we have this version of MSVS installed.
 test._msvs_versions = ['8.0']
@@ -59,7 +58,7 @@ SConscript_contents = SConscript_contents.replace('\'Release\'', '\'Release|x64\
 
 
 
-test.write('SConstruct', SConscript_contents)
+test.write('SConstruct', SConscript_contents%{'HOST_ARCH': host_arch})
 
 test.run(arguments="Test.vcproj")