summaryrefslogtreecommitdiff
path: root/test/Scanner
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 +0000
committerSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 +0000
commit1bdd31363a68cfe791e84ac6d7fbf2147a3afd36 (patch)
treeba438f3b4b6ca3aeb5358e83904a7a7713e4b027 /test/Scanner
parentc24d3ebbe70d64a0e3a9663e04e2ecf3333ec961 (diff)
downloadscons-1bdd31363a68cfe791e84ac6d7fbf2147a3afd36.tar.gz
Issue 2647: In Executor.Null.get_all_children(), really return all of
the children, including the explicit dependencies, not just the sources.
Diffstat (limited to 'test/Scanner')
-rw-r--r--test/Scanner/generated.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index 8b087321..845111ce 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()