diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-07-19 21:27:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 21:27:47 (GMT) |
| commit | 116364e65a86d3ca9b596bc1d589832595a57443 (patch) | |
| tree | 4cf050f3ebbda29c94f80c354e25fa0b976946ba /test | |
| parent | 9f49d9c9b11bd3aa69fef5944838f52f49b804ae (diff) | |
| parent | fe8e5013e9c0a313efe97c9eb55dc8f050ac5e0a (diff) | |
| download | SCons-116364e65a86d3ca9b596bc1d589832595a57443.zip SCons-116364e65a86d3ca9b596bc1d589832595a57443.tar.gz SCons-116364e65a86d3ca9b596bc1d589832595a57443.tar.bz2 | |
Merge branch 'master' into topic/grossag/msvs
Diffstat (limited to 'test')
| -rw-r--r-- | test/Decider/Environment.py | 2 | ||||
| -rw-r--r-- | test/Decider/Node.py | 2 | ||||
| -rw-r--r-- | test/Decider/default.py | 2 | ||||
| -rw-r--r-- | test/Decider/mixed.py | 6 | ||||
| -rw-r--r-- | test/packaging/rpm/explicit-target.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/test/Decider/Environment.py b/test/Decider/Environment.py index 58cd57b..4a23b5c 100644 --- a/test/Decider/Environment.py +++ b/test/Decider/Environment.py @@ -38,7 +38,7 @@ DefaultEnvironment(tools=[]) import os.path env = Environment(tools=[]) env.Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE')) -def my_decider(dependency, target, prev_ni): +def my_decider(dependency, target, prev_ni, repo_node=None): return os.path.exists('has-changed') env.Decider(my_decider) """) diff --git a/test/Decider/Node.py b/test/Decider/Node.py index c1910de..0fa9726 100644 --- a/test/Decider/Node.py +++ b/test/Decider/Node.py @@ -38,7 +38,7 @@ import os.path file_in = File('file.in') file_out = File('file.out') Command(file_out, file_in, Copy('$TARGET', '$SOURCE')) -def my_decider(dependency, target, prev_ni): +def my_decider(dependency, target, prev_ni, repo_node): return os.path.exists('has-changed') file_in.Decider(my_decider) """) diff --git a/test/Decider/default.py b/test/Decider/default.py index 5d0a452..78f981e 100644 --- a/test/Decider/default.py +++ b/test/Decider/default.py @@ -36,7 +36,7 @@ test.write('SConstruct', """ DefaultEnvironment(tools=[]) import os.path Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE')) -def my_decider(dependency, target, prev_ni): +def my_decider(dependency, target, prev_ni, repo_node=None): return os.path.exists('has-changed') Decider(my_decider) """) diff --git a/test/Decider/mixed.py b/test/Decider/mixed.py index 08daa7d..711bd2b 100644 --- a/test/Decider/mixed.py +++ b/test/Decider/mixed.py @@ -47,11 +47,11 @@ denv.Command('ddd.out', 'ddd.in', Copy('$TARGET', '$SOURCE')) denv.Command('n2.out', n2_in, Copy('$TARGET', '$SOURCE')) env.Command( 'eee.out', 'eee.in', Copy('$TARGET', '$SOURCE')) env.Command( 'n3.out', n3_in, Copy('$TARGET', '$SOURCE')) -def default_decider(dependency, target, prev_ni): +def default_decider(dependency, target, prev_ni, repo_node=None): return os.path.exists('default-has-changed') -def env_decider(dependency, target, prev_ni): +def env_decider(dependency, target, prev_ni, repo_node=None): return os.path.exists('env-has-changed') -def node_decider(dependency, target, prev_ni): +def node_decider(dependency, target, prev_ni, repo_node=None): return os.path.exists('node-has-changed') Decider(default_decider) env.Decider(env_decider) diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py index 553ce27..48b5c83 100644 --- a/test/packaging/rpm/explicit-target.py +++ b/test/packaging/rpm/explicit-target.py @@ -77,7 +77,7 @@ env.Package( NAME = 'foo', expect = """ scons: *** Setting target is not supported for rpm. -""" + test.python_file_line(test.workpath('SConstruct'), 12) +""" + test.python_file_line(test.workpath('SConstruct'), 23) test.run(arguments='', status=2, stderr=expect) |