From 6f237a0d0607e6a684e8c4a9a5d19d661e9487e2 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 15 Jun 2010 17:53:27 +0000 Subject: Issue 2647: In Executor.Null.get_all_children(), really return all of the children, including the explicit dependencies, not just the sources. --- src/CHANGES.txt | 5 +- src/engine/SCons/Executor.py | 2 +- test/Depends.py | 157 ------------------------------------------- test/Depends/Depends.py | 150 +++++++++++++++++++++++++++++++++++++++++ test/Depends/no-Builder.py | 66 ++++++++++++++++++ test/Scanner/generated.py | 11 ++- 6 files changed, 229 insertions(+), 162 deletions(-) delete mode 100644 test/Depends.py create mode 100644 test/Depends/Depends.py create mode 100644 test/Depends/no-Builder.py diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b30ba5c..2dda4d1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,9 +7,10 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - From John Doe: + From Steven Knight: - - Whatever John Doe did. + - Fix explicit dependencies (Depends()) on Nodes that don't have + attached Builders. RELEASE 2.0.0.beta.20100605 - Sat, 05 Jun 2010 21:02:48 -0700 diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index 07a4ee6..6f2489b 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -596,7 +596,7 @@ class Null(object): def get_all_sources(self): return self.batches[0].targets[0].sources def get_all_children(self): - return self.get_all_sources() + return self.batches[0].targets[0].children() def get_all_prerequisites(self): return [] def get_action_side_effects(self): diff --git a/test/Depends.py b/test/Depends.py deleted file mode 100644 index e3819c5..0000000 --- a/test/Depends.py +++ /dev/null @@ -1,157 +0,0 @@ -#!/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__" - -import os.path - -import TestSCons - -_python_ = TestSCons._python_ - -test = TestSCons.TestSCons() - -test.subdir('subdir', 'sub2') - -test.write('build.py', r""" -import sys -contents = open(sys.argv[2], 'rb').read() + open(sys.argv[3], 'rb').read() -file = open(sys.argv[1], 'wb') -file.write(contents) -file.close() -""") - -SUBDIR_foo_dep = os.path.join('$SUBDIR', 'foo.dep') -SUBDIR_f3_out = os.path.join('$SUBDIR', 'f3.out') - -test.write('SConstruct', """ -Foo = Builder(action = r'%(_python_)s build.py $TARGET $SOURCES subdir/foo.dep') -Bar = Builder(action = r'%(_python_)s build.py $TARGET $SOURCES subdir/bar.dep') -env = Environment(BUILDERS = { 'Foo' : Foo, 'Bar' : Bar }, SUBDIR='subdir') -env.Depends(target = ['f1.out', 'f2.out'], dependency = r'%(SUBDIR_foo_dep)s') -env.Depends(target = r'%(SUBDIR_f3_out)s', dependency = 'subdir/bar.dep') -env.Foo(target = 'f1.out', source = 'f1.in') -env.Foo(target = 'f2.out', source = 'f2.in') -env.Bar(target = 'subdir/f3.out', source = 'f3.in') -SConscript('subdir/SConscript', "env") -env.Foo(target = 'f5.out', source = 'f5.in') -env.Bar(target = 'sub2/f6.out', source = 'f6.in') -env.Depends(target = 'f5.out', dependency = 'sub2') -""" % locals()) - -test.write(['subdir', 'SConscript'], """ -Import("env") -Depends(target = 'f4.out', dependency = 'bar.dep') -env.Bar(target = 'f4.out', source = 'f4.in') -""") - -test.write('f1.in', "f1.in\n") -test.write('f2.in', "f2.in\n") -test.write('f3.in', "f3.in\n") -test.write(['subdir', 'f4.in'], "subdir/f4.in\n") -test.write('f5.in', "f5.in\n") -test.write('f6.in', "f6.in\n") - -test.write(['subdir', 'foo.dep'], "subdir/foo.dep 1\n") -test.write(['subdir', 'bar.dep'], "subdir/bar.dep 1\n") - -test.run(arguments = '.') - -test.must_match('f1.out', "f1.in\nsubdir/foo.dep 1\n") -test.must_match('f2.out', "f2.in\nsubdir/foo.dep 1\n") -test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 1\n") -test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 1\n") -test.must_match('f5.out', "f5.in\nsubdir/foo.dep 1\n") -test.must_match(['sub2', 'f6.out'], "f6.in\nsubdir/bar.dep 1\n") - -# -test.write(['subdir', 'foo.dep'], "subdir/foo.dep 2\n") -test.write(['subdir', 'bar.dep'], "subdir/bar.dep 2\n") -test.write('f6.in', "f6.in 2\n") - -test.run(arguments = '.') - -test.must_match('f1.out', "f1.in\nsubdir/foo.dep 2\n") -test.must_match('f2.out', "f2.in\nsubdir/foo.dep 2\n") -test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 2\n") -test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 2\n") -test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") -test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") - -# -test.write(['subdir', 'foo.dep'], "subdir/foo.dep 3\n") - -test.run(arguments = '.') - -test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") -test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") -test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 2\n") -test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 2\n") -test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") -test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") - -# -test.write(['subdir', 'bar.dep'], "subdir/bar.dep 3\n") - -test.run(arguments = '.') - -test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") -test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") -test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 3\n") -test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 3\n") -test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") -test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") - -# -test.write('f6.in', "f6.in 3\n") - -test.run(arguments = '.') - -test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") -test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") -test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 3\n") -test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 3\n") -test.must_match('f5.out', "f5.in\nsubdir/foo.dep 3\n") -test.must_match(['sub2', 'f6.out'], "f6.in 3\nsubdir/bar.dep 3\n") - -# -test.write('SConstruct', """\ -env = Environment() -file1 = File('file1') -file2 = File('file2') -env.Depends(file1, [[file2, 'file3']]) -""") - -test.write('file2', "file2\n") -test.write('file3', "file3\n") - -test.up_to_date(arguments = '.') - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Depends/Depends.py b/test/Depends/Depends.py new file mode 100644 index 0000000..6804fd0 --- /dev/null +++ b/test/Depends/Depends.py @@ -0,0 +1,150 @@ +#!/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__" + +""" +Verifies basic execution of the Depends() function. +""" + +import os.path + +import TestSCons + +_python_ = TestSCons._python_ + +test = TestSCons.TestSCons() + +test.subdir('subdir', 'sub2') + +test.write('build.py', r""" +import sys +fp = open(sys.argv[1], 'wb') +for fname in sys.argv[2:]: + fp.write(open(fname, 'rb').read()) +fp.close() +sys.exit(0) +""") + +SUBDIR_foo_dep = os.path.join('$SUBDIR', 'foo.dep') +SUBDIR_f3_out = os.path.join('$SUBDIR', 'f3.out') + +test.write('SConstruct', """ +Foo = Builder(action = r'%(_python_)s build.py $TARGET $SOURCES subdir/foo.dep') +Bar = Builder(action = r'%(_python_)s build.py $TARGET $SOURCES subdir/bar.dep') +env = Environment(BUILDERS = { 'Foo' : Foo, 'Bar' : Bar }, SUBDIR='subdir') +env.Depends(target = ['f1.out', 'f2.out'], dependency = r'%(SUBDIR_foo_dep)s') +env.Depends(target = r'%(SUBDIR_f3_out)s', dependency = 'subdir/bar.dep') +env.Foo(target = 'f1.out', source = 'f1.in') +env.Foo(target = 'f2.out', source = 'f2.in') +env.Bar(target = 'subdir/f3.out', source = 'f3.in') +SConscript('subdir/SConscript', "env") +env.Foo(target = 'f5.out', source = 'f5.in') +env.Bar(target = 'sub2/f6.out', source = 'f6.in') +env.Depends(target = 'f5.out', dependency = 'sub2') +""" % locals()) + +test.write(['subdir', 'SConscript'], """ +Import("env") +Depends(target = 'f4.out', dependency = 'bar.dep') +env.Bar(target = 'f4.out', source = 'f4.in') +""") + +test.write('f1.in', "f1.in\n") +test.write('f2.in', "f2.in\n") +test.write('f3.in', "f3.in\n") +test.write(['subdir', 'f4.in'], "subdir/f4.in\n") +test.write('f5.in', "f5.in\n") +test.write('f6.in', "f6.in\n") + +test.write(['subdir', 'foo.dep'], "subdir/foo.dep 1\n") +test.write(['subdir', 'bar.dep'], "subdir/bar.dep 1\n") + +test.run(arguments = '.') + +test.must_match('f1.out', "f1.in\nsubdir/foo.dep 1\n") +test.must_match('f2.out', "f2.in\nsubdir/foo.dep 1\n") +test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 1\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 1\n") +test.must_match('f5.out', "f5.in\nsubdir/foo.dep 1\n") +test.must_match(['sub2', 'f6.out'], "f6.in\nsubdir/bar.dep 1\n") + +# +test.write(['subdir', 'foo.dep'], "subdir/foo.dep 2\n") +test.write(['subdir', 'bar.dep'], "subdir/bar.dep 2\n") +test.write('f6.in', "f6.in 2\n") + +test.run(arguments = '.') + +test.must_match('f1.out', "f1.in\nsubdir/foo.dep 2\n") +test.must_match('f2.out', "f2.in\nsubdir/foo.dep 2\n") +test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 2\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 2\n") +test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") +test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") + +# +test.write(['subdir', 'foo.dep'], "subdir/foo.dep 3\n") + +test.run(arguments = '.') + +test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") +test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") +test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 2\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 2\n") +test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") +test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") + +# +test.write(['subdir', 'bar.dep'], "subdir/bar.dep 3\n") + +test.run(arguments = '.') + +test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") +test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") +test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 3\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 3\n") +test.must_match('f5.out', "f5.in\nsubdir/foo.dep 2\n") +test.must_match(['sub2', 'f6.out'], "f6.in 2\nsubdir/bar.dep 2\n") + +# +test.write('f6.in', "f6.in 3\n") + +test.run(arguments = '.') + +test.must_match('f1.out', "f1.in\nsubdir/foo.dep 3\n") +test.must_match('f2.out', "f2.in\nsubdir/foo.dep 3\n") +test.must_match(['subdir', 'f3.out'], "f3.in\nsubdir/bar.dep 3\n") +test.must_match(['subdir', 'f4.out'], "subdir/f4.in\nsubdir/bar.dep 3\n") +test.must_match('f5.out', "f5.in\nsubdir/foo.dep 3\n") +test.must_match(['sub2', 'f6.out'], "f6.in 3\nsubdir/bar.dep 3\n") + +# +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Depends/no-Builder.py b/test/Depends/no-Builder.py new file mode 100644 index 0000000..2d49756 --- /dev/null +++ b/test/Depends/no-Builder.py @@ -0,0 +1,66 @@ +#!/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__" + +""" +Verifies the Depends() function when used with Nodes that have no Builder. +""" + +import TestSCons + +test = TestSCons.TestSCons() + +# +test.write('SConstruct', """\ +env = Environment() +file1 = File('file1') +file2 = File('file2') +env.Depends(file1, [[file2, 'file3']]) +# Verify that a "hidden" file created by another action causes the +# action to run when an explicit Dependency is specified. +# See tigris.org issue 2647. +env.Depends('hidden', 'file4.out') +env.Command('file4.out', 'file4.in', + [Copy('$TARGET', '$SOURCE'), Touch('hidden')]) +""") + +test.write('file2', "file2\n") +test.write('file3', "file3\n") +test.write('file4.in', "file4.in\n") + +test.run(arguments = 'hidden') + +test.must_exist('hidden') +test.must_match('file4.out', "file4.in\n") + +test.up_to_date(arguments = '.') + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py index 8b08732..845111c 100644 --- a/test/Scanner/generated.py +++ b/test/Scanner/generated.py @@ -415,14 +415,21 @@ int g_3() test.run(stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) +# Note that the generated .h files still get scanned twice, +# but that's really once each as a child of libg_1.o and libg_2.o. +# +# TODO(sgk): can the duplication be eliminated safely? Batch build +# support "eliminated" the duplication before in a way that broke a +# use case that ended up in test/Depends/no-Builder.py (issue 2647). + test.must_match("MyCScan.out", """\ libg_1.c: 1 libg_2.c: 1 libg_3.c: 1 -libg_gx.h: 1 +libg_gx.h: 2 libg_gy.h: 1 libg_gz.h: 1 -libg_w.h: 1 +libg_w.h: 2 """) test.pass_test() -- cgit v0.12