diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-06-05 03:18:15 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-06-05 03:18:15 (GMT) |
| commit | ddbf45ad4b1086ac6493c0d3649310945d85313a (patch) | |
| tree | d626936fe75e669a137228cf72137030cba2e47b /test/MSVS/vs-6.0-clean.py | |
| parent | 87bd27f06c0e23fedb66c4c5a46b564c1ce88ce7 (diff) | |
| download | SCons-ddbf45ad4b1086ac6493c0d3649310945d85313a.zip SCons-ddbf45ad4b1086ac6493c0d3649310945d85313a.tar.gz SCons-ddbf45ad4b1086ac6493c0d3649310945d85313a.tar.bz2 | |
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.
Diffstat (limited to 'test/MSVS/vs-6.0-clean.py')
| -rw-r--r-- | test/MSVS/vs-6.0-clean.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/MSVS/vs-6.0-clean.py b/test/MSVS/vs-6.0-clean.py index 8db5189..052acae 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=".") |