Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

7 files changed, 9 insertions, 9 deletions

diff --git a/QMTest/README.txt b/QMTest/README.txt
index 1348c49..98b4dd8 100644
--- a/QMTest/README.txt
+++ b/QMTest/README.txt
@@ -55,4 +55,4 @@ the pieces here are local to SCons.
         really using it as originally envisioned.
 
 Copyright (c) 2001 - 2015 The SCons Foundation
-QMTest/README.txt rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog
+QMTest/README.txt rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog
diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index 7fb6ca1..1e955f7 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -14,7 +14,7 @@ attributes defined in this subclass.
 
 # Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestRuntest.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/TestRuntest.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 import os
 import os.path
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index fb6e7b0..ff3c0a9 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -15,7 +15,7 @@ attributes defined in this subclass.
 # Copyright (c) 2001 - 2015 The SCons Foundation
 from __future__ import division
 
-__revision__ = "QMTest/TestSCons.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/TestSCons.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 import os
 import re
@@ -34,7 +34,7 @@ from TestCmd import PIPE
 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.3.6'
+default_version = '2.4.0'
 
 python_version_unsupported = (2, 3, 0)
 python_version_deprecated = (2, 7, 0)
@@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0)
 # line must remain "__ VERSION __" (without the spaces) so the built
 # version in build/QMTest/TestSCons.py contains the actual version
 # string of the packages that have been built.
-SConsVersion = '2.3.6'
+SConsVersion = '2.4.0'
 if SConsVersion == '__' + 'VERSION' + '__':
     SConsVersion = default_version
 
diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py
index d794d7b..4c86ece 100644
--- a/QMTest/TestSConsMSVS.py
+++ b/QMTest/TestSConsMSVS.py
@@ -15,7 +15,7 @@ in this subclass.
 
 # Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsMSVS.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/TestSConsMSVS.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 import os
 import sys
diff --git a/QMTest/TestSCons_time.py b/QMTest/TestSCons_time.py
index 8c0d2a1..d73ea82 100644
--- a/QMTest/TestSCons_time.py
+++ b/QMTest/TestSCons_time.py
@@ -13,7 +13,7 @@ attributes defined in this subclass.
 
 # Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSCons_time.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/TestSCons_time.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 import os
 import os.path
diff --git a/QMTest/TestSConsign.py b/QMTest/TestSConsign.py
index facf5a5..6a06316 100644
--- a/QMTest/TestSConsign.py
+++ b/QMTest/TestSConsign.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsign.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/TestSConsign.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 __doc__ = """
 TestSConsign.py:  a testing framework for the "sconsign" script 
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index 067944c..8b37158 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -28,7 +28,7 @@ QMTest classes to support SCons' testing and Aegis-inspired workflow.
 Thanks to Stefan Seefeld for the initial code.
 """
 
-__revision__ = "QMTest/scons_tdb.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "QMTest/scons_tdb.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 ########################################################################
 # Imports