diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-05-26 16:17:09 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-05-26 16:17:09 (GMT) |
commit | 545d2a0a389e9eacdb1d92fbf5f26f2d981029ad (patch) | |
tree | 23f5cda5c621bd7bb657ef9fd1d07e4578d4a934 /test/Deprecated/TargetSignatures/overrides.py | |
parent | 5c2e07585593ee4994b8e7d79b3d181a56cd7f13 (diff) | |
download | SCons-545d2a0a389e9eacdb1d92fbf5f26f2d981029ad.zip SCons-545d2a0a389e9eacdb1d92fbf5f26f2d981029ad.tar.gz SCons-545d2a0a389e9eacdb1d92fbf5f26f2d981029ad.tar.bz2 |
Start the deprecation cycle for the BuildDir() method and the build_dir
keyword parameter.
Several existing tests were still using BuildDir() or build_dir; they were
converted to use VariantDir() and variant_dir.
New tests were added to validate that the --warn=deprecated-build-dir option
and the SetOption method did the right thing. This led to the discovery that
a commonly-used test pattern provided by the infrastructure gobbled up too
much, causing tests to succeed when they should have failed. Fixing the
pattern led to other tests needing to be fixed.
In the process, it was discovered that the SCONSFLAG environment variable was
not getting correctly reset to its original value. Fixing this also caused
additional tests to misbehave, requiring them to be updated.
And test/Sig.py, which tests the deprecated SCons.Sig module, was moved to
the test/Deprecated directory.
All in all, quite a lot of action for what was supposed to be a simple change.
Diffstat (limited to 'test/Deprecated/TargetSignatures/overrides.py')
-rw-r--r-- | test/Deprecated/TargetSignatures/overrides.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Deprecated/TargetSignatures/overrides.py b/test/Deprecated/TargetSignatures/overrides.py index bc8de34..54a66d4 100644 --- a/test/Deprecated/TargetSignatures/overrides.py +++ b/test/Deprecated/TargetSignatures/overrides.py @@ -48,7 +48,7 @@ test.write('foo.in', "foo.in\n") expect = TestSCons.re_escape(""" scons: warning: The env.TargetSignatures() method is deprecated; \tconvert your build to use the env.Decider() method instead. -""") + TestSCons.file_expr + TestSCons.deprecated_python_expr +""") + TestSCons.file_expr test.run(arguments = '.', stderr = expect) |