[PR #3444] fix test issues with --debug removals

There were several uses of deprecated debug flags that had
not been moved to to test/Deprecated, and so were missed
when those moved to test/Removed.

Also removed options from manpage.

Signed-off-by: Mats Wichmann <mats@linux.com>

6 files changed, 11 insertions, 28 deletions

diff --git a/test/Interactive/tree.py b/test/Interactive/tree.py
index 61faa22..c10962a 100644
--- a/test/Interactive/tree.py
+++ b/test/Interactive/tree.py
@@ -69,23 +69,6 @@ test.must_match(test.workpath('foo.out'), "foo.in 2\n")
 
 
 
-scons.send("build --debug=tree foo.out\n")
-
-expect_stdout = """\
-scons>>> Copy("foo.out", "foo.in")
-scons>>> Touch("1")
-scons>>> Copy("foo.out", "foo.in")
-+-foo.out
-  +-foo.in
-scons>>> Touch("2")
-scons>>> scons: `foo.out' is up to date.
-scons>>> 
-"""
-
-test.finish(scons, stdout = expect_stdout)
-
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Removed/debug-tree.py b/test/Removed/debug-tree.py
index 73aa4c9..06287de 100644
--- a/test/Removed/debug-tree.py
+++ b/test/Removed/debug-tree.py
@@ -26,6 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
 Test that the --debug=tree option fails with expected exception
+Check command-line, SCONSFLAGS and interactive
 """
 
 import os
@@ -48,6 +49,12 @@ os.environ['SCONSFLAGS'] = '--debug=tree'
 test.run(arguments="-H", status=2, stderr=expect)
 
 
+# moved test from test/Interactive/tree.py
+scons = test.start(arguments = '-Q --interactive')
+scons.send("build --debug=tree\n")
+test.finish(scons, status=2, stderr=expect)
+
+
 test.pass_test()
 
 # Local Variables:
diff --git a/test/option--tree.py b/test/option--tree.py
index 0bf2c06..1b34176 100644
--- a/test/option--tree.py
+++ b/test/option--tree.py
@@ -45,13 +45,6 @@ SCons Error: `foofoo' is not a valid --tree option type, try:
 """,
          status=2)
 
-test.run(arguments='--debug=tree',
-         stderr="""
-scons: warning: The --debug=tree option is deprecated; please use --tree=all instead.
-.*
-""",
-         status=0, match=TestSCons.match_re_dotall)
-
 
 # Test that unicode characters can be printed (escaped) with the --tree option
 test.write('SConstruct',
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index 48b5c83..fba0237 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -67,7 +67,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              target         = "my_rpm_package.rpm",
diff --git a/test/packaging/rpm/multipackage.py b/test/packaging/rpm/multipackage.py
index 2f106f4..4a29a40 100644
--- a/test/packaging/rpm/multipackage.py
+++ b/test/packaging/rpm/multipackage.py
@@ -67,7 +67,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              SOURCE_URL     = 'http://foo.org/foo-1.2.3.tar.gz'
@@ -80,7 +80,7 @@ env.Package( NAME           = 'foo2',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
         )
diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py
index 23ebe05..0ef5fad 100644
--- a/test/packaging/rpm/package.py
+++ b/test/packaging/rpm/package.py
@@ -66,7 +66,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              SOURCE_URL     = 'http://foo.org/foo-1.2.3.tar.gz'