diff options
Diffstat (limited to 'test/Deprecated/SourceSignatures/env.py')
-rw-r--r-- | test/Deprecated/SourceSignatures/env.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/Deprecated/SourceSignatures/env.py b/test/Deprecated/SourceSignatures/env.py index b2d6241..4851140 100644 --- a/test/Deprecated/SourceSignatures/env.py +++ b/test/Deprecated/SourceSignatures/env.py @@ -37,7 +37,7 @@ import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) base_sconstruct_contents = """\ -SetOption('warn', 'no-deprecated-source-signatures') +SetOption('warn', 'deprecated-source-signatures') def build(env, target, source): open(str(target[0]), 'wt').write(open(str(source[0]), 'rt').read()) B = Builder(action = build) @@ -57,6 +57,11 @@ def write_SConstruct(test, env_sigtype, default_sigtype): test.write('SConstruct', contents) +expect = TestSCons.re_escape(""" +scons: warning: The env.SourceSignatures() method is deprecated; +\tconvert your build to use the env.Decider() method instead. +""") + TestSCons.file_expr + TestSCons.deprecated_python_expr + write_SConstruct(test, 'MD5', 'timestamp') @@ -65,8 +70,7 @@ test.write('f2.in', "f2.in\n") test.write('f3.in', "f3.in\n") test.write('f4.in', "f4.in\n") -test.run(arguments = 'f1.out f3.out', - stderr = TestSCons.deprecated_python_expr) +test.run(arguments = 'f1.out f3.out', stderr = expect) test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout = re.escape(test.wrap_stdout("""\ @@ -75,8 +79,7 @@ build(["f2.out"], ["f2.in"]) scons: `f3.out' is up to date. build(["f4.out"], ["f4.in"]) """)), - stderr = TestSCons.deprecated_python_expr) - + stderr = expect) test.sleep() @@ -91,12 +94,11 @@ scons: `f2.out' is up to date. scons: `f3.out' is up to date. scons: `f4.out' is up to date. """)), - stderr = TestSCons.deprecated_python_expr) + stderr = expect) test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out', stderr = None) - test.pass_test() # Local Variables: |