Merged revisions 1582-1665 via svnmerge from

[scons.git] / QMTest / TestSCons.py

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 0904d315253b647b5fe5142d606b3f93ab71fc1d..de15526431726f3eba0a3afef08de6cde65ef793 100644 (file)
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -24,6 +24,14 @@ import sys
 from TestCommon import *
 from TestCommon import __all__
 
+# Some tests which verify that SCons has been packaged properly need to
+# look for specific version file names.  Replicating the version number
+# here provides independent verification that what we packaged conforms
+# to what we expect.  (If we derived the version number from the same
+# data driving the build we might miss errors if the logic breaks.)
+
+SConsVersion = '0.96.92'
+
 __all__.extend([ 'TestSCons',
                  'python',
                  '_exe',
@@ -36,6 +44,7 @@ __all__.extend([ 'TestSCons',
                ])
 
 python = python_executable
+_python_ = '"' + python_executable + '"'
 _exe = exe_suffix
 _obj = obj_suffix
 _shobj = shobj_suffix
@@ -105,6 +114,8 @@ class TestSCons(TestCommon):
     initializations.
     """
 
+    scons_version = SConsVersion
+
     def __init__(self, **kw):
         """Initialize an SCons testing object.
 
@@ -398,12 +409,12 @@ void my_qt_symbol(const char *arg) {
 }
 """)
 
-        self.write(['qt', 'lib', 'SConstruct'], r"""
+        self.write([dir, 'lib', 'SConstruct'], r"""
 env = Environment()
-env.StaticLibrary( 'myqt', 'my_qobject.cpp' )
+env.SharedLibrary( 'myqt', 'my_qobject.cpp' )
 """)
 
-        self.run(chdir = self.workpath('qt', 'lib'),
+        self.run(chdir = self.workpath(dir, 'lib'),
                  arguments = '.',
                  stderr = noisy_ar,
                  match = self.match_re_dotall)
@@ -412,6 +423,7 @@ env.StaticLibrary( 'myqt', 'my_qobject.cpp' )
         self.QT_LIB = 'myqt'
         self.QT_MOC = '%s %s' % (python, self.workpath(dir, 'bin', 'mymoc.py'))
         self.QT_UIC = '%s %s' % (python, self.workpath(dir, 'bin', 'myuic.py'))
+        self.QT_LIB_DIR = self.workpath(dir, 'lib')
 
     def Qt_create_SConstruct(self, place):
         if type(place) is type([]):