diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-02-23 23:39:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 23:39:43 (GMT) |
| commit | b6c8997131e5941aee3f77e8a8e7719e25b96462 (patch) | |
| tree | 2261a5d912f95563662515842c40f508bb6597ac | |
| parent | 731b4bbca9ec4f1f80e3a27e1cc428ad3721e46f (diff) | |
| parent | 0d458ee9fad0f1003938f8d1612cd449c2ff53b8 (diff) | |
| download | SCons-b6c8997131e5941aee3f77e8a8e7719e25b96462.zip SCons-b6c8997131e5941aee3f77e8a8e7719e25b96462.tar.gz SCons-b6c8997131e5941aee3f77e8a8e7719e25b96462.tar.bz2 | |
Merge pull request #3565 from bdbaddog/fix_IMPLICIT_COMMAND_DEPENDENCIES_TESTS
Fix implicit command dependencies tests
| -rwxr-xr-x | src/CHANGES.txt | 7 | ||||
| -rw-r--r-- | test/Repository/Program.py | 5 | ||||
| -rw-r--r-- | test/Repository/StaticLibrary.py | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 574f64b..20b99c4 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -29,9 +29,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From Adam Gross: - Added support for scanning multiple entries in an action string if - IMPLICIT_COMMAND_DEPENDENCIES is set to 2. This opts into more thorough - action scanning where every string in the command is scanned to determine - if it is a non-source and non-target path. + IMPLICIT_COMMAND_DEPENDENCIES is set to 2 or 'all'. This enables more thorough + action scanning where every item in each command line is scanned to determine + if it is a non-source and non-target path and added to the list of implicit dependencies + for the target. - Added support for taking instances of the Value class as implicit dependencies. - Added new module SCons.Scanner.Python to allow scanning .py files. diff --git a/test/Repository/Program.py b/test/Repository/Program.py index 9e8af77..75860a7 100644 --- a/test/Repository/Program.py +++ b/test/Repository/Program.py @@ -32,9 +32,10 @@ if sys.platform == 'win32': else: _exe = '' -for implicit_deps in ['0', '1', '2', 'all']: +for implicit_deps in ['0', '1', '"all"']: # First, test a single repository. test = TestSCons.TestSCons() + test.verbose_set(1) test.subdir('repository', 'work1') repository = test.workpath('repository') repository_foo_c = test.workpath('repository', 'foo.c') @@ -42,6 +43,7 @@ for implicit_deps in ['0', '1', '2', 'all']: work1_foo_c = test.workpath('work1', 'foo.c') test.write(['work1', 'SConstruct'], r""" +DefaultEnvironment(tools=[]) Repository(r'%s') env = Environment(IMPLICIT_COMMAND_DEPENDENCIES=%s) env.Program(target= 'foo', source = Split('aaa.c bbb.c foo.c')) @@ -184,6 +186,7 @@ repository/foo.c work2_foo = test.workpath('work2', 'foo' + _exe) test.write(['work2', 'SConstruct'], r""" +DefaultEnvironment(tools=[]) Repository(r'%s') Repository(r'%s') env = Environment() diff --git a/test/Repository/StaticLibrary.py b/test/Repository/StaticLibrary.py index acd4b83..29cb841 100644 --- a/test/Repository/StaticLibrary.py +++ b/test/Repository/StaticLibrary.py @@ -30,7 +30,7 @@ import TestSCons _obj = TestSCons._obj _exe = TestSCons._exe -for implicit_deps in ['0', '1', '2', 'all']: +for implicit_deps in ['1', '2']: test = TestSCons.TestSCons() # |