From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Thu, 10 Dec 2009 16:27:03 +0000 (+0000)
Subject: Provide an environment variable that can be used to override
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70fb19d74b058dfe5e496f586c870a48ccee5ec2;p=scons.git

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.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@4545 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 9fd38c84..f73de041 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)