diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
| commit | 678c769bc6189b5b7c301fbecfb37496725f6aee (patch) | |
| tree | 0b0b37051a29dd48d2fb9c9c49a11182a276a0d9 /test/SWIG/module-deduced-name.py | |
| parent | a035c43fb34cc888fca250f26f68fc2b03c018ac (diff) | |
| download | SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.zip SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.gz SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.bz2 | |
SWIG: improve tool detection, and update SWIG tests to run on Windows.
The tool detection is improved by checking for swig in
env['SWIG'], where it is commonly set, as well as env['ENV']['PATH'].
The tests mostly didn't work on Windows. I updated them all.
Mostly to build 32-bit extensions when using 32-bit python on
Windows, and use .pyd as the python extension on Windows.
Diffstat (limited to 'test/SWIG/module-deduced-name.py')
| -rw-r--r-- | test/SWIG/module-deduced-name.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/SWIG/module-deduced-name.py b/test/SWIG/module-deduced-name.py index 733b6c1..bdaef4f 100644 --- a/test/SWIG/module-deduced-name.py +++ b/test/SWIG/module-deduced-name.py @@ -32,6 +32,7 @@ emitter should return the basename of the module only. import TestSCons import os +import sys test = TestSCons.TestSCons() @@ -45,8 +46,15 @@ Python_h = os.path.join(python_include, 'Python.h') if not os.path.exists(Python_h): test.skip_test('Cannot find %s, skipping test.\n' % Python_h) +# On Windows, build a 32-bit exe if on 32-bit python. +if sys.platform == 'win32' and sys.maxsize <= 2**32: + swig_arch_var="TARGET_ARCH='x86'," +else: + swig_arch_var="" + test.write(['SConstruct'], """\ env = Environment(SWIGFLAGS = '-python -c++', + %(swig_arch_var)s CPPPATH=[r"%(python_include)s"], SWIG=[r'%(swig)s'], SWIGOUTDIR='python/build dir', |