diff options
Diffstat (limited to 'test/SWIG')
-rw-r--r-- | test/SWIG/SWIGOUTDIR-python.py | 4 | ||||
-rw-r--r-- | test/SWIG/build-dir.py | 4 | ||||
-rw-r--r-- | test/SWIG/generated_swigfile.py | 4 | ||||
-rw-r--r-- | test/SWIG/live.py | 4 | ||||
-rw-r--r-- | test/SWIG/module-deduced-name.py | 4 | ||||
-rw-r--r-- | test/SWIG/module-parens.py | 4 | ||||
-rw-r--r-- | test/SWIG/module-quoted.py | 4 | ||||
-rw-r--r-- | test/SWIG/module-spaces.py | 4 | ||||
-rw-r--r-- | test/SWIG/noproxy.py | 4 | ||||
-rw-r--r-- | test/SWIG/recursive-includes-cpp.py | 4 | ||||
-rw-r--r-- | test/SWIG/remove-modules.py | 4 | ||||
-rw-r--r-- | test/SWIG/subdir.py | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/test/SWIG/SWIGOUTDIR-python.py b/test/SWIG/SWIGOUTDIR-python.py index 53b5bdf..8d6703f 100644 --- a/test/SWIG/SWIGOUTDIR-python.py +++ b/test/SWIG/SWIGOUTDIR-python.py @@ -38,8 +38,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # On Windows, build a 32-bit exe if on 32-bit python. if sys.platform == 'win32' and sys.maxsize <= 2**32: diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py index b203abe..d268c87 100644 --- a/test/SWIG/build-dir.py +++ b/test/SWIG/build-dir.py @@ -48,8 +48,8 @@ else: test.subdir(['source']) -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) if sys.platform == 'win32' and sys.maxsize <= 2**32: swig_arch_var="TARGET_ARCH='x86'," diff --git a/test/SWIG/generated_swigfile.py b/test/SWIG/generated_swigfile.py index 4686dae..145349b 100644 --- a/test/SWIG/generated_swigfile.py +++ b/test/SWIG/generated_swigfile.py @@ -53,8 +53,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # handle testing on other platforms: ldmodule_prefix = '_' diff --git a/test/SWIG/live.py b/test/SWIG/live.py index f0cf1d5..a64defe 100644 --- a/test/SWIG/live.py +++ b/test/SWIG/live.py @@ -46,8 +46,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) swig = swig.replace('\\','/') python = python.replace('\\','/') diff --git a/test/SWIG/module-deduced-name.py b/test/SWIG/module-deduced-name.py index 6b4d6d9..14d23a2 100644 --- a/test/SWIG/module-deduced-name.py +++ b/test/SWIG/module-deduced-name.py @@ -39,8 +39,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Cannot find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # On Windows, build a 32-bit exe if on 32-bit python. if sys.platform == 'win32' and sys.maxsize <= 2**32: diff --git a/test/SWIG/module-parens.py b/test/SWIG/module-parens.py index 040ef28..4ce7511 100644 --- a/test/SWIG/module-parens.py +++ b/test/SWIG/module-parens.py @@ -38,8 +38,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # swig-python expects specific filenames. # the platform specific suffix won't necessarily work. diff --git a/test/SWIG/module-quoted.py b/test/SWIG/module-quoted.py index 8bf9e86..60bc0b0 100644 --- a/test/SWIG/module-quoted.py +++ b/test/SWIG/module-quoted.py @@ -38,8 +38,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # swig-python expects specific filenames. # the platform specific suffix won't necessarily work. diff --git a/test/SWIG/module-spaces.py b/test/SWIG/module-spaces.py index ce16497..6a3f270 100644 --- a/test/SWIG/module-spaces.py +++ b/test/SWIG/module-spaces.py @@ -38,8 +38,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # swig-python expects specific filenames. # the platform specific suffix won't necessarily work. diff --git a/test/SWIG/noproxy.py b/test/SWIG/noproxy.py index b4abbc3..f94f553 100644 --- a/test/SWIG/noproxy.py +++ b/test/SWIG/noproxy.py @@ -46,8 +46,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # handle testing on other platforms: ldmodule_prefix = '_' diff --git a/test/SWIG/recursive-includes-cpp.py b/test/SWIG/recursive-includes-cpp.py index 4cb8fe5..3999cc3 100644 --- a/test/SWIG/recursive-includes-cpp.py +++ b/test/SWIG/recursive-includes-cpp.py @@ -44,8 +44,8 @@ for pre_req in ['swig', 'python']: if not test.where_is(pre_req): test.skip_test('Can not find installed "' + pre_req + '", skipping test.%s' % os.linesep) -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) if sys.platform == 'win32': python_lib = os.path.dirname(sys.executable) + "/libs/" + ('python%d%d'%(sys.version_info[0],sys.version_info[1])) + '.lib' diff --git a/test/SWIG/remove-modules.py b/test/SWIG/remove-modules.py index ecbc19c..a4d7b16 100644 --- a/test/SWIG/remove-modules.py +++ b/test/SWIG/remove-modules.py @@ -46,8 +46,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # handle testing on other platforms: ldmodule_prefix = '_' diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py index 062f8dc..6951753 100644 --- a/test/SWIG/subdir.py +++ b/test/SWIG/subdir.py @@ -48,8 +48,8 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') -python, python_include, python_libpath, python_lib, python_h = \ - test.get_platform_python_info() +python, python_include, python_libpath, python_lib = \ + test.get_platform_python_info(python_h_required=True) # handle testing on other platforms: ldmodule_prefix = '_' |