summaryrefslogtreecommitdiff
path: root/test/CPPPATH
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-05-26 16:17:09 +0000
committerGreg Noel <GregNoel@tigris.org>2010-05-26 16:17:09 +0000
commit60e5433803cb9f42e80239983cf4b7586711fbad (patch)
tree23f5cda5c621bd7bb657ef9fd1d07e4578d4a934 /test/CPPPATH
parent86ea0fcb2c764ed5cc71c75a3fbbee14c73f43a1 (diff)
downloadscons-60e5433803cb9f42e80239983cf4b7586711fbad.tar.gz
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/CPPPATH')
-rw-r--r--test/CPPPATH/subdir-as-include.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/CPPPATH/subdir-as-include.py b/test/CPPPATH/subdir-as-include.py
index 1ff70a5f..06a1a58c 100644
--- a/test/CPPPATH/subdir-as-include.py
+++ b/test/CPPPATH/subdir-as-include.py
@@ -46,7 +46,7 @@ env = Environment(CPPPATH = [Dir('inc1')])
env.Program('prog.cpp')
Export('env')
-SConscript('inc1/SConscript', build_dir='inc1/build', duplicate=0)
+SConscript('inc1/SConscript', variant_dir='inc1/build', duplicate=0)
""")
test.write('prog.cpp', """\