summaryrefslogtreecommitdiffstats
path: root/test/SWIG/live.py
diff options
context:
space:
mode:
authorDaniel Moody <dmoody256@gmail.com>2017-12-27 22:46:38 (GMT)
committerDaniel Moody <dmoody256@gmail.com>2018-05-25 14:49:49 (GMT)
commitc299f365221f80e2325d391e9c15f4c1e2632486 (patch)
tree7f488035cbe9ef862c6b52f61538f7dc4e1df510 /test/SWIG/live.py
parent105cc64306ad8e5af41ba02941576082b6326caf (diff)
downloadSCons-c299f365221f80e2325d391e9c15f4c1e2632486.zip
SCons-c299f365221f80e2325d391e9c15f4c1e2632486.tar.gz
SCons-c299f365221f80e2325d391e9c15f4c1e2632486.tar.bz2
fixed swig tests to work on windows
Diffstat (limited to 'test/SWIG/live.py')
-rw-r--r--test/SWIG/live.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/test/SWIG/live.py b/test/SWIG/live.py
index 05971aa..684cff1 100644
--- a/test/SWIG/live.py
+++ b/test/SWIG/live.py
@@ -48,9 +48,14 @@ if not swig:
python, python_include, python_libpath, python_lib = \
test.get_platform_python_info()
-Python_h = os.path.join(python_include, 'Python.h')
+Python_h = python_include + '/Python.h'
if not os.path.exists(Python_h):
test.skip_test('Can not find %s, skipping test.\n' % Python_h)
+swig = swig.replace('\\','/')
+python = python.replace('\\','/')
+python_include = python_include.replace('\\','/')
+python_libpath = python_libpath.replace('\\','/')
+python_lib = python_lib.replace('\\','/')
# handle testing on other platforms:
ldmodule_prefix = '_'
@@ -142,7 +147,7 @@ test.up_to_date(arguments = ldmodule_prefix+'foo' + _dll)
test.run(arguments = ldmodule_prefix+'bar' + _dll)
-test.must_match('wrapper.out', "wrapper.py\n")
+test.must_match('wrapper.out', "wrapper.py" + os.linesep)
test.run(program = python, stdin = """\
from __future__ import print_function
@@ -164,4 +169,4 @@ test.pass_test()
# tab-width:4
# indent-tabs-mode:nil
# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
+# vim: set expandtab tabstop=4 shiftwidth=4: \ No newline at end of file