summaryrefslogtreecommitdiffstats
path: root/test/MSVS/vs-7.1-variant_dir.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2010-06-05 03:18:15 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2010-06-05 03:18:15 (GMT)
commitddbf45ad4b1086ac6493c0d3649310945d85313a (patch)
treed626936fe75e669a137228cf72137030cba2e47b /test/MSVS/vs-7.1-variant_dir.py
parent87bd27f06c0e23fedb66c4c5a46b564c1ce88ce7 (diff)
downloadSCons-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-7.1-variant_dir.py')
-rw-r--r--test/MSVS/vs-7.1-variant_dir.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/MSVS/vs-7.1-variant_dir.py b/test/MSVS/vs-7.1-variant_dir.py
index 78afa8a..98640e3 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=".")