- fixed directory/file fixtures for "general" mode

- added documentation for the testing framework
- converted two old tests from the "packaging" section to using fixtures as reference examples

1 files changed, 5 insertions, 5 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 86c0dec..360a799 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -240,11 +240,6 @@ class TestSCons(TestCommon):
                 pass
             else:
                 os.chdir(script_dir)
-        else:
-            try:
-                self.script_srcdir = os.environ['PYTHON_SCRIPT_DIR']
-            except KeyError:
-                pass
         if 'program' not in kw:
             kw['program'] = os.environ.get('SCONS')
             if not kw['program']:
@@ -281,6 +276,11 @@ class TestSCons(TestCommon):
             if SCons.Node.FS.default_fs is None:
                 SCons.Node.FS.default_fs = SCons.Node.FS.FS()
 
+        try:
+            self.script_srcdir = os.environ['PYTHON_SCRIPT_DIR']
+        except KeyError:
+            pass
+
     def Environment(self, ENV=None, *args, **kw):
         """
         Return a construction Environment that optionally overrides