From e51f211505aa5cdd81c2db6cbcb0b93a73c146e3 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Thu, 13 Feb 2020 06:57:16 -0700 Subject: [PR #3554] trim unused bits from swig tests Three files in the previous fix got an added call to pull in the wrapper.py fixture; it turns out they didn't actually use it - appeared in a dummy call to Clone but the cloned env was never used. Drop those bits. Signed-off-by: Mats Wichmann --- test/SWIG/SWIGPATH.py | 5 ----- test/SWIG/implicit-dependencies.py | 7 +------ test/SWIG/noproxy.py | 3 --- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/test/SWIG/SWIGPATH.py b/test/SWIG/SWIGPATH.py index fcce4c2..ef4fb18 100644 --- a/test/SWIG/SWIGPATH.py +++ b/test/SWIG/SWIGPATH.py @@ -37,10 +37,6 @@ if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') swig = swig.replace('\\','/') -_python_ = TestSCons._python_ - -test.file_fixture('wrapper.py') - test.subdir('inc1', 'inc2') test.write(['inc2', 'dependency.i'], """\ @@ -58,7 +54,6 @@ foo = Environment(SWIGFLAGS='-python', SWIG='%(swig)s', SWIGPATH=['inc1', 'inc2']) swig = foo.Dictionary('SWIG') -bar = foo.Clone(SWIG = [r'%(_python_)s', 'wrapper.py', swig]) foo.CFile(target = 'dependent', source = ['dependent.i']) """ % locals()) diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py index d9eaa8e..311ecc3 100644 --- a/test/SWIG/implicit-dependencies.py +++ b/test/SWIG/implicit-dependencies.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/asr/bin/env python # # __COPYRIGHT__ # @@ -37,10 +37,6 @@ if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') swig = swig.replace('\\','/') -_python_ = TestSCons._python_ - -test.file_fixture('wrapper.py') - test.write("dependency.i", """\ %module dependency """) @@ -54,7 +50,6 @@ test.write("dependent.i", """\ test.write('SConstruct', """ foo = Environment(SWIGFLAGS='-python', SWIG='%(swig)s') swig = foo.Dictionary('SWIG') -bar = foo.Clone(SWIG = [r'%(_python_)s', 'wrapper.py', swig]) foo.CFile(target = 'dependent', source = ['dependent.i']) """ % locals()) diff --git a/test/SWIG/noproxy.py b/test/SWIG/noproxy.py index e3dde61..deeaa3a 100644 --- a/test/SWIG/noproxy.py +++ b/test/SWIG/noproxy.py @@ -52,8 +52,6 @@ python, python_include, python_libpath, python_lib = \ # handle testing on other platforms: ldmodule_prefix = '_' -test.file_fixture('wrapper.py') - test.write("dependency.i", """\ %module dependency """) @@ -75,7 +73,6 @@ foo = Environment(SWIGFLAGS=['-python', '-noproxy'], ) swig = foo.Dictionary('SWIG') -bar = foo.Clone(SWIG = [r'%(python)s', 'wrapper.py', swig]) foo.CFile(target = 'dependent', source = ['dependent.i']) """ % locals()) -- cgit v0.12