Merged revisions 2647-2719 via svnmerge from

[scons.git] / test / Deprecated / SourceSignatures / overrides.py

diff --git a/test/SourceSignatures/overrides.py b/test/Deprecated/SourceSignatures/overrides.py
similarity index 85%
rename from test/SourceSignatures/overrides.py
rename to test/Deprecated/SourceSignatures/overrides.py
index cf83488b721ab019497c45a88be1521ca46afd5e..de1cc95b476d447543bc8580735e01c40ffefe35 100644 (file)
--- a/test/SourceSignatures/overrides.py
+++ b/test/Deprecated/SourceSignatures/overrides.py
@@ -34,9 +34,10 @@ content signature.)
 
 import TestSCons
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 test.write('SConstruct', """\
+SetOption('warn', 'no-deprecated-source-signatures')
 DefaultEnvironment().SourceSignatures('MD5')
 env = Environment()
 env.SourceSignatures('timestamp')
@@ -45,12 +46,14 @@ env.Command('foo.out', 'foo.in', Copy('$TARGET', '$SOURCE'), FOO=1)
 
 test.write('foo.in', "foo.in 1\n")
 
-test.run(arguments = 'foo.out')
+test.run(arguments = 'foo.out',
+         stderr = TestSCons.deprecated_python_expr)
 
 test.sleep()
 
 test.write('foo.in', "foo.in 1\n")
 
-test.not_up_to_date(arguments = 'foo.out')
+test.not_up_to_date(arguments = 'foo.out',
+                    stderr = TestSCons.deprecated_python_expr)
 
 test.pass_test()