http://scons.tigris.org/issues/show_bug.cgi?id=2365

Thanks to Steven Knight, the SCCS and Perforce tests have been debugged.  Only
the BitKeeper test remains to be debugged.

2 files changed, 4 insertions, 5 deletions

diff --git a/test/Deprecated/SourceCode/Perforce/Perforce.py b/test/Deprecated/SourceCode/Perforce/Perforce.py
index 3be5a77..d732b57 100644
--- a/test/Deprecated/SourceCode/Perforce/Perforce.py
+++ b/test/Deprecated/SourceCode/Perforce/Perforce.py
@@ -46,8 +46,6 @@ msg_sc = """SourceCode() has been deprecated and there is no replacement.
 \tIf you need this function, please contact dev@scons.tigris.org."""
 warn_sc = test.deprecated_wrap(msg_sc)
 
-test.skip_test("Need Perforce to debug these tests.\n")
-
 class TestPerforce(TestSCons.TestSCons):
     def __init__(self, *args, **kw):
         TestSCons.TestSCons.__init__(self, *args, **kw)
@@ -277,7 +275,10 @@ test.write(['work', 'foo', 'bbb.in'], "work/foo/bbb.in\n")
 test.subdir(['work', 'foo', 'sub'])
 test.write(['work', 'foo', 'sub', 'eee.in'], "work/foo/sub/eee.in\n")
 
-test.run(chdir = 'work', arguments = '.', stderr = warn_p4 + warn_sc)
+test.run(chdir = 'work',
+         arguments = '.',
+         stderr = warn_p4 + warn_sc,
+         match = TestSCons.match_re_dotall)
 
 test.fail_test(test.read(['work', 'all']) != "import/aaa.in\nwork/foo/bbb.in\nimport/ccc.in\n")
 test.fail_test(test.read(['work', 'foo', 'sub', 'all']) != "import/sub/ddd.in\nwork/foo/sub/eee.in\nimport/sub/fff.in\n")
diff --git a/test/Deprecated/SourceCode/SCCS/diskcheck.py b/test/Deprecated/SourceCode/SCCS/diskcheck.py
index 774a92c..d2364b6 100644
--- a/test/Deprecated/SourceCode/SCCS/diskcheck.py
+++ b/test/Deprecated/SourceCode/SCCS/diskcheck.py
@@ -43,8 +43,6 @@ msg_sc = """SourceCode() has been deprecated and there is no replacement.
 \tIf you need this function, please contact dev@scons.tigris.org."""
 warn_sc = test.deprecated_wrap(msg_sc)
 
-test.skip_test("Need SCCS to debug these tests.\n")
-
 sccs = test.where_is('sccs')
 if not sccs:
     test.skip_test("Could not find 'sccs'; skipping test(s).\n")