summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-12-10 16:27:03 (GMT)
committerSteven Knight <knight@baldmt.com>2009-12-10 16:27:03 (GMT)
commit2f30f111b0419546e6565fe096530ae3a32c12f3 (patch)
tree9e01210c6ecc07bafe21d4b8e1c62d7a07c6a088
parent1aa80be9015d405417dc28352ef31fc257577aee (diff)
downloadSCons-2f30f111b0419546e6565fe096530ae3a32c12f3.zip
SCons-2f30f111b0419546e6565fe096530ae3a32c12f3.tar.gz
SCons-2f30f111b0419546e6565fe096530ae3a32c12f3.tar.bz2
Provide an environment variable that can be used to override
setting --warn=no-visual-c-missing when trying to run the new timing-script infrastructure against older versions of SCons that don't have that warning.
-rw-r--r--QMTest/TestSCons.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 9fd38c8..f73de04 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -367,7 +367,13 @@ class TestSCons(TestCommon):
sconsflags = []
if self.ignore_python_version and deprecated_python_version():
sconsflags = sconsflags + ['--warn=no-python-version']
- sconsflags = sconsflags + ['--warn=no-visual-c-missing']
+ # Provide a way to suppress or provide alternate flags for
+ # TestSCons purposes by setting TESTSCONS_SCONSFLAGS.
+ # (The intended use case is to set it to null when running
+ # timing tests of earlier versions of SCons which don't
+ # support the --warn=no-visual-c-missing warning.)
+ sconsflags = sconsflags + [os.environ.get('TESTSCONS_SCONSFLAGS',
+ '--warn=no-visual-c-missing')]
os.environ['SCONSFLAGS'] = string.join(sconsflags)
try:
result = apply(TestCommon.run, (self,)+args, kw)