summaryrefslogtreecommitdiffstats
path: root/test/Scanner
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 (GMT)
committerSteven Knight <knight@baldmt.com>2010-06-15 17:53:27 (GMT)
commit6f237a0d0607e6a684e8c4a9a5d19d661e9487e2 (patch)
treeba438f3b4b6ca3aeb5358e83904a7a7713e4b027 /test/Scanner
parent894e7eb8ee6f062f076bec3b33d13d19c475faaa (diff)
downloadSCons-6f237a0d0607e6a684e8c4a9a5d19d661e9487e2.zip
SCons-6f237a0d0607e6a684e8c4a9a5d19d661e9487e2.tar.gz
SCons-6f237a0d0607e6a684e8c4a9a5d19d661e9487e2.tar.bz2
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 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()