Merged revisions 2647-2719 via svnmerge from

[scons.git] / test / Deprecated / SourceSignatures / implicit-cache.py

diff --git a/test/SourceSignatures/implicit-cache.py b/test/Deprecated/SourceSignatures/implicit-cache.py
similarity index 71%
rename from test/SourceSignatures/implicit-cache.py
rename to test/Deprecated/SourceSignatures/implicit-cache.py
index de66b72f349de80667a924308f9fb5cf85fd2eaf..44c30ce44867aa5dffe54f6ae7e823a7f5384b8e 100644 (file)
--- a/test/SourceSignatures/implicit-cache.py
+++ b/test/Deprecated/SourceSignatures/implicit-cache.py
@@ -29,11 +29,14 @@ Test the simultaneous use of implicit_cache and
 SourceSignatures('timestamp')
 """
 
+import re
+
 import TestSCons
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 test.write('SConstruct', """\
+SetOption('warn', 'no-deprecated-source-signatures')
 SetOption('implicit_cache', 1)
 SourceSignatures('timestamp')
 
@@ -44,13 +47,15 @@ env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'both.out', source = 'both.in')
 """)
 
-both_out_both_in = test.wrap_stdout('build(["both.out"], ["both.in"])\n')
+both_out_both_in = re.escape(test.wrap_stdout('build(["both.out"], ["both.in"])\n'))
 
 
 
 test.write('both.in', "both.in 1\n")
 
-test.run(arguments = 'both.out', stdout = both_out_both_in)
+test.run(arguments = 'both.out',
+         stdout = both_out_both_in,
+         stderr = TestSCons.deprecated_python_expr)
 
 
 
@@ -58,7 +63,9 @@ test.sleep(2)
 
 test.write('both.in', "both.in 2\n")
 
-test.run(arguments = 'both.out', stdout = both_out_both_in)
+test.run(arguments = 'both.out',
+         stdout = both_out_both_in,
+         stderr = TestSCons.deprecated_python_expr)
 
 
 
@@ -66,7 +73,9 @@ test.sleep(2)
 
 test.write('both.in', "both.in 3\n")
 
-test.run(arguments = 'both.out', stdout = both_out_both_in)
+test.run(arguments = 'both.out',
+         stdout = both_out_both_in,
+         stderr = TestSCons.deprecated_python_expr)
 
 
 
@@ -74,13 +83,15 @@ test.sleep(2)
 
 test.write('both.in', "both.in 4\n")
 
-test.run(arguments = 'both.out', stdout = both_out_both_in)
+test.run(arguments = 'both.out',
+         stdout = both_out_both_in,
+         stderr = TestSCons.deprecated_python_expr)
 
 
 
 test.sleep(2)
 
-test.up_to_date(arguments = 'both.out')
+test.up_to_date(arguments = 'both.out', stderr = None)