From fc19d103e3e80582fecf1594abfa68595a196d24 Mon Sep 17 00:00:00 2001 From: Zachary Tessler Date: Fri, 6 Oct 2017 10:56:05 -0400 Subject: Fix incorrect warning of different environments for a target when repeating identical builder or Command calls that use overrides --- src/CHANGES.txt | 3 +++ src/engine/SCons/Builder.py | 9 ++++++++- test/Builder/non-multi.py | 5 +++++ test/Command.py | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a7ad6f2..c9faf86 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -26,6 +26,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER This was introduced by a pull request to allow recursive variable evaluations to yield a string such as "$( $( some stuff $) $)". + From Zachary Tessler: + - Fix incorrect warning for repeated identical builder calls that use overrides + RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 NOTE: This is a major release. You should expect that some targets may rebuild when upgrading. diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index afc2cf0..b5f1a92 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -291,7 +291,14 @@ def _node_errors(builder, env, tlist, slist): if t.side_effect: raise UserError("Multiple ways to build the same target were specified for: %s" % t) if t.has_explicit_builder(): - if not t.env is None and not t.env is env: + # Check for errors when the environments are different + # No error if environments are the same Environment instance + if (not t.env is None and not t.env is env and + # Check OverrideEnvironment case - no error if wrapped Environments + # are the same instance, and overrides lists match + not (getattr(t.env, '__subject', 0) is getattr(env, '__subject', 1) and + getattr(t.env, 'overrides', 0) == getattr(env, 'overrides', 1) and + not builder.multi)): action = t.builder.action t_contents = t.builder.action.get_contents(tlist, slist, t.env) contents = builder.action.get_contents(tlist, slist, env) diff --git a/test/Builder/non-multi.py b/test/Builder/non-multi.py index 70e800c..baf0ed0 100644 --- a/test/Builder/non-multi.py +++ b/test/Builder/non-multi.py @@ -43,13 +43,18 @@ B = Builder(action=build, multi=0) env = Environment(BUILDERS = { 'B' : B }) env.B(target = 'file7.out', source = 'file7.in') env.B(target = 'file7.out', source = 'file7.in') +env.B(target = 'file8.out', source = 'file8.in', arg=1) +env.B(target = 'file8.out', source = 'file8.in', arg=1) """) test.write('file7.in', 'file7.in\n') +test.write('file8.in', 'file8.in\n') test.run(arguments='file7.out') +test.run(arguments='file8.out') test.must_match('file7.out', "file7.in\n") +test.must_match('file8.out', "file8.in\n") test.pass_test() diff --git a/test/Command.py b/test/Command.py index e6b9028..c36fb33 100644 --- a/test/Command.py +++ b/test/Command.py @@ -78,6 +78,8 @@ env.Command(target = 'f3.out', source = 'f3.in', Command(target = 'f4.out', source = 'sub', action = sub) env.Command(target = 'f5.out', source = 'f5.in', action = buildIt, XYZZY='XYZZY is set') +env.Command(target = 'f5.out', source = 'f5.in', action = buildIt, + XYZZY='XYZZY is set') Command(target = 'f6.out', source = 'f6.in', action = r'%(_python_)s build.py f6.out f6.in') env.Command(target = 'f7.out', source = 'f7.in', -- cgit v0.12 From 6ed44024b2941de36c0b583fe9b29b7bea3bdbda Mon Sep 17 00:00:00 2001 From: Zachary Tessler Date: Thu, 12 Oct 2017 13:15:06 -0400 Subject: Two new tests to verify warnings when targets are repeated with same actions, but either environments or overrides differ. --- test/Builder/same-actions-diff-envs.py | 62 +++++++++++++++++++++++++++++ test/Builder/same-actions-diff-overrides.py | 61 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 test/Builder/same-actions-diff-envs.py create mode 100644 test/Builder/same-actions-diff-overrides.py diff --git a/test/Builder/same-actions-diff-envs.py b/test/Builder/same-actions-diff-envs.py new file mode 100644 index 0000000..b111737 --- /dev/null +++ b/test/Builder/same-actions-diff-envs.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify that two builders in two environments with the same actions generate +a warning +""" + +import TestSCons + +test = TestSCons.TestSCons(match=TestSCons.match_re) + +test.write('SConstruct', """\ +def build(env, target, source): + file = open(str(target[0]), 'w') + file.write('1') + +B = Builder(action=build) +env = Environment(BUILDERS = { 'B' : B }) +env2 = Environment(BUILDERS = { 'B' : B }) +env.B('out.txt', []) +env2.B('out.txt', []) +""") + +expect = TestSCons.re_escape(""" +scons: warning: Two different environments were specified for target out.txt, +\tbut they appear to have the same action: build(target, source, env) +""") + TestSCons.file_expr + +test.run(arguments='out.txt', status=0, stderr=expect) +test.must_match('out.txt', '1') + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Builder/same-actions-diff-overrides.py b/test/Builder/same-actions-diff-overrides.py new file mode 100644 index 0000000..dde7dd9 --- /dev/null +++ b/test/Builder/same-actions-diff-overrides.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verify that two calls to a builder with different overrides, but the same +action, generate a warning +""" + +import TestSCons + +test = TestSCons.TestSCons(match=TestSCons.match_re) + +test.write('SConstruct', """\ +def build(env, target, source): + file = open(str(target[0]), 'w') + file.write('1') + +B = Builder(action=build) +env = Environment(BUILDERS = { 'B' : B }) +env.B('out.txt', [], arg=1) +env.B('out.txt', [], arg=2) +""") + +expect = TestSCons.re_escape(""" +scons: warning: Two different environments were specified for target out.txt, +\tbut they appear to have the same action: build(target, source, env) +""") + TestSCons.file_expr + +test.run(arguments='out.txt', status=0, stderr=expect) +test.must_match('out.txt', '1') + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12