Refactor Environment/Executor/Node scanner interaction a little. Put --debug={dtree,includes,stree,tree} in separate tests.

5 files changed, 458 insertions, 148 deletions

diff --git a/test/option--debug.py b/test/option--debug.py
index 322afda..2ded69a 100644
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -65,154 +65,8 @@ test.write('bar.h', """
 #endif
 """)
 
-test.run(arguments = "--debug=tree foo.xxx")
-
-tree = """
-+-foo.xxx
-  +-foo.ooo
-  | +-foo.c
-  | +-foo.h
-  | +-bar.h
-  +-bar.ooo
-    +-bar.c
-    +-bar.h
-    +-foo.h
-"""
-
-test.fail_test(string.find(test.stdout(), tree) == -1)
-
-test.run(arguments = "--debug=tree foo.xxx")
-test.fail_test(string.find(test.stdout(), tree) == -1)
-
-stree = """
-[E B   C]+-foo.xxx
-[E B   C]  +-foo.ooo
-[E      ]  | +-foo.c
-[E      ]  | +-foo.h
-[E      ]  | +-bar.h
-[E B   C]  +-bar.ooo
-[E      ]    +-bar.c
-[E      ]    +-bar.h
-[E      ]    +-foo.h
-"""
-
-test.run(arguments = "--debug=stree foo.xxx")
-test.fail_test(string.find(test.stdout(), stree) == -1)
-
-stree2 = """
- E       = exists
-  R      = exists in repository only
-   b     = implicit builder
-   B     = explicit builder
-    S    = side effect
-     P   = precious
-      A  = always build
-       C = current
-
-[  B    ]+-foo.xxx
-[  B    ]  +-foo.ooo
-[E      ]  | +-foo.c
-[E      ]  | +-foo.h
-[E      ]  | +-bar.h
-[  B    ]  +-bar.ooo
-[E      ]    +-bar.c
-[E      ]    +-bar.h
-[E      ]    +-foo.h
-"""
-
-test.run(arguments = '-c foo.xxx')
-test.run(arguments = "--no-exec --debug=stree foo.xxx")
-test.fail_test(string.find(test.stdout(), stree2) == -1)
-
-
-
-dtree = """
-+-foo.xxx
-  +-foo.ooo
-  +-bar.ooo
-"""
-
-test.run(arguments = "--debug=dtree foo.xxx")
-test.fail_test(string.find(test.stdout(), dtree) == -1)
-
-includes = """
-+-foo.c
-  +-foo.h
-    +-bar.h
-"""
-test.run(arguments = "--debug=includes foo.ooo")
-test.fail_test(string.find(test.stdout(), includes) == -1)
-
-# Make sure we print the debug stuff even if there's a build failure.
-test.write('bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "foo.h"
-#endif
-THIS SHOULD CAUSE A BUILD FAILURE
-""")
-
-test.run(arguments = "--debug=tree foo.xxx",
-         status = 2,
-         stderr = None)
-test.fail_test(string.find(test.stdout(), tree) == -1)
-
-test.run(arguments = "--debug=dtree foo.xxx",
-         status = 2,
-         stderr = None)
-test.fail_test(string.find(test.stdout(), dtree) == -1)
-
-# In an ideal world, --debug=includes would also work when there's a build
-# failure, but this would require even more complicated logic to scan
-# all of the intermediate nodes that get skipped when the build failure
-# occurs.  On the YAGNI theory, we're just not going to worry about this
-# until it becomes an issue that someone actually cares enough about.
-#test.run(arguments = "--debug=includes foo.xxx",
-#         status = 2,
-#         stderr = None)
-#test.fail_test(string.find(test.stdout(), includes) == -1)
-
-# Restore bar.h to something good.
-test.write('bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "foo.h"
-#endif
-""")
-
-# These shouldn't print out anything in particular, but
-# they shouldn't crash either:
-test.run(arguments = "--debug=includes .")
-test.run(arguments = "--debug=includes foo.c")
-
-tree = """scons: `.' is up to date.
-
-+-.
-  +-SConstruct
-  +-bar.c
-  +-bar.h
-  +-bar.ooo
-  | +-bar.c
-  | +-bar.h
-  | +-foo.h
-  +-foo.c
-  +-foo.h
-  +-foo.ooo
-  | +-foo.c
-  | +-foo.h
-  | +-bar.h
-  +-foo.xxx
-    +-foo.ooo
-    | +-foo.c
-    | +-foo.h
-    | +-bar.h
-    +-bar.ooo
-      +-bar.c
-      +-bar.h
-      +-foo.h
-"""
-test.run(arguments = "--debug=tree .")
-test.fail_test(string.find(test.stdout(), tree) == -1)
+############################
+# test --debug=time
 
 test.run(arguments = "--debug=pdb", stdin = "n\ns\nq\n")
 test.fail_test(string.find(test.stdout(), "(Pdb)") == -1)
diff --git a/test/option/debug-dtree.py b/test/option/debug-dtree.py
new file mode 100644
index 0000000..c93ff7f
--- /dev/null
+++ b/test/option/debug-dtree.py
@@ -0,0 +1,107 @@
+#!/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__"
+
+"""
+Test that the --debug=dtree option correctly prints just the explicit
+dependencies (sources or Depends()) of a target.
+"""
+
+import TestSCons
+import sys
+import string
+import re
+import time
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
+env.Program('foo', Split('foo.c bar.c'))
+""")
+
+test.write('foo.c', r"""
+#include "foo.h"
+int main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("f1.c\n");
+	exit (0);
+}
+""")
+
+test.write('bar.c', """
+#include "bar.h"
+""")
+
+test.write('foo.h', """
+#ifndef FOO_H
+#define FOO_H
+#include "bar.h"
+#endif
+""")
+
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+""")
+
+dtree1 = """
++-foo.xxx
+  +-foo.ooo
+  +-bar.ooo
+"""
+
+test.run(arguments = "--debug=dtree foo.xxx")
+test.fail_test(string.find(test.stdout(), dtree1) == -1)
+
+dtree2 = """
++-.
+  +-bar.ooo
+  +-foo.ooo
+  +-foo.xxx
+    +-foo.ooo
+    +-bar.ooo
+"""
+test.run(arguments = "--debug=dtree .")
+test.fail_test(string.find(test.stdout(), dtree2) == -1)
+
+# Make sure we print the debug stuff even if there's a build failure.
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+THIS SHOULD CAUSE A BUILD FAILURE
+""")
+
+test.run(arguments = "--debug=dtree foo.xxx",
+         status = 2,
+         stderr = None)
+test.fail_test(string.find(test.stdout(), dtree1) == -1)
+
+test.pass_test()
diff --git a/test/option/debug-includes.py b/test/option/debug-includes.py
new file mode 100644
index 0000000..c232175
--- /dev/null
+++ b/test/option/debug-includes.py
@@ -0,0 +1,105 @@
+#!/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__"
+
+"""
+Test that the --debug=includes option prints the implicit
+dependencies of a target.
+"""
+
+import TestSCons
+import sys
+import string
+import re
+import time
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
+env.Program('foo', Split('foo.c bar.c'))
+""")
+
+test.write('foo.c', r"""
+#include "foo.h"
+int main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("f1.c\n");
+	exit (0);
+}
+""")
+
+test.write('bar.c', """
+#include "bar.h"
+""")
+
+test.write('foo.h', """
+#ifndef FOO_H
+#define FOO_H
+#include "bar.h"
+#endif
+""")
+
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+""")
+
+includes = """
++-foo.c
+  +-foo.h
+    +-bar.h
+"""
+test.run(arguments = "--debug=includes foo.ooo")
+test.fail_test(string.find(test.stdout(), includes) == -1)
+
+# In an ideal world, --debug=includes would also work when there's a build
+# failure, but this would require even more complicated logic to scan
+# all of the intermediate nodes that get skipped when the build failure
+# occurs.  On the YAGNI theory, we're just not going to worry about this
+# until it becomes an issue that someone actually cares enough about.
+
+#test.write('bar.h', """
+##ifndef BAR_H
+##define BAR_H
+##include "foo.h"
+##endif
+#THIS SHOULD CAUSE A BUILD FAILURE
+#""")
+
+#test.run(arguments = "--debug=includes foo.xxx",
+#         status = 2,
+#         stderr = None)
+#test.fail_test(string.find(test.stdout(), includes) == -1)
+
+# These shouldn't print out anything in particular, but
+# they shouldn't crash either:
+test.run(arguments = "--debug=includes .")
+test.run(arguments = "--debug=includes foo.c")
+
+test.pass_test()
diff --git a/test/option/debug-stree.py b/test/option/debug-stree.py
new file mode 100644
index 0000000..ba18cfb
--- /dev/null
+++ b/test/option/debug-stree.py
@@ -0,0 +1,114 @@
+#!/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__"
+
+"""
+Test that the --debug=stree option prints a dependency tree with output
+that indicates the state of various Node status flags.
+"""
+
+import TestSCons
+import sys
+import string
+import re
+import time
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
+env.Program('foo', Split('foo.c bar.c'))
+""")
+
+test.write('foo.c', r"""
+#include "foo.h"
+int main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("f1.c\n");
+	exit (0);
+}
+""")
+
+test.write('bar.c', """
+#include "bar.h"
+""")
+
+test.write('foo.h', """
+#ifndef FOO_H
+#define FOO_H
+#include "bar.h"
+#endif
+""")
+
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+""")
+
+stree = """
+[E B   C]+-foo.xxx
+[E B   C]  +-foo.ooo
+[E      ]  | +-foo.c
+[E      ]  | +-foo.h
+[E      ]  | +-bar.h
+[E B   C]  +-bar.ooo
+[E      ]    +-bar.c
+[E      ]    +-bar.h
+[E      ]    +-foo.h
+"""
+
+test.run(arguments = "--debug=stree foo.xxx")
+test.fail_test(string.find(test.stdout(), stree) == -1)
+
+stree2 = """
+ E       = exists
+  R      = exists in repository only
+   b     = implicit builder
+   B     = explicit builder
+    S    = side effect
+     P   = precious
+      A  = always build
+       C = current
+
+[  B    ]+-foo.xxx
+[  B    ]  +-foo.ooo
+[E      ]  | +-foo.c
+[E      ]  | +-foo.h
+[E      ]  | +-bar.h
+[  B    ]  +-bar.ooo
+[E      ]    +-bar.c
+[E      ]    +-bar.h
+[E      ]    +-foo.h
+"""
+
+test.run(arguments = '-c foo.xxx')
+
+test.run(arguments = "--no-exec --debug=stree foo.xxx")
+test.fail_test(string.find(test.stdout(), stree2) == -1)
+
+test.pass_test()
diff --git a/test/option/debug-tree.py b/test/option/debug-tree.py
new file mode 100644
index 0000000..4bb1229
--- /dev/null
+++ b/test/option/debug-tree.py
@@ -0,0 +1,130 @@
+#!/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__"
+
+"""
+Test that the --debug=tree option prints a tree representation of the
+complete dependencies of a target.
+"""
+
+import TestSCons
+import sys
+import string
+import re
+import time
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
+env.Program('foo', Split('foo.c bar.c'))
+""")
+
+test.write('foo.c', r"""
+#include "foo.h"
+int main(int argc, char *argv[])
+{
+	argv[argc++] = "--";
+	printf("f1.c\n");
+	exit (0);
+}
+""")
+
+test.write('bar.c', """
+#include "bar.h"
+""")
+
+test.write('foo.h', """
+#ifndef FOO_H
+#define FOO_H
+#include "bar.h"
+#endif
+""")
+
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+""")
+
+tree1 = """
++-foo.xxx
+  +-foo.ooo
+  | +-foo.c
+  | +-foo.h
+  | +-bar.h
+  +-bar.ooo
+    +-bar.c
+    +-bar.h
+    +-foo.h
+"""
+
+test.run(arguments = "--debug=tree foo.xxx")
+test.fail_test(string.find(test.stdout(), tree1) == -1)
+
+tree2 = """
++-.
+  +-SConstruct
+  +-bar.c
+  +-bar.h
+  +-bar.ooo
+  | +-bar.c
+  | +-bar.h
+  | +-foo.h
+  +-foo.c
+  +-foo.h
+  +-foo.ooo
+  | +-foo.c
+  | +-foo.h
+  | +-bar.h
+  +-foo.xxx
+    +-foo.ooo
+    | +-foo.c
+    | +-foo.h
+    | +-bar.h
+    +-bar.ooo
+      +-bar.c
+      +-bar.h
+      +-foo.h
+"""
+test.run(arguments = "--debug=tree .")
+test.fail_test(string.find(test.stdout(), tree2) == -1)
+
+# Make sure we print the debug stuff even if there's a build failure.
+test.write('bar.h', """
+#ifndef BAR_H
+#define BAR_H
+#include "foo.h"
+#endif
+THIS SHOULD CAUSE A BUILD FAILURE
+""")
+
+test.run(arguments = "--debug=tree foo.xxx",
+         status = 2,
+         stderr = None)
+test.fail_test(string.find(test.stdout(), tree1) == -1)
+
+test.pass_test()