summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrbd <garlicbready@googlemail.com>2017-06-21 00:15:23 (GMT)
committergrbd <garlicbready@googlemail.com>2017-06-21 00:15:23 (GMT)
commit4967ba7fe355283654561d02417564de82649f7e (patch)
tree804a26580008086aad828eec8a3d5a55d4c1f316
parent4024bd986cde1fd161e4ae77357f6f84fffa2c16 (diff)
downloadSCons-4967ba7fe355283654561d02417564de82649f7e.zip
SCons-4967ba7fe355283654561d02417564de82649f7e.tar.gz
SCons-4967ba7fe355283654561d02417564de82649f7e.tar.bz2
Changed to os.pathsep for fixture dirs
-rw-r--r--QMTest/TestSCons.py2
-rwxr-xr-xruntest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 17a9eda..6941e1c 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -270,7 +270,7 @@ class TestSCons(TestCommon):
SCons.Node.FS.default_fs = SCons.Node.FS.FS()
try:
- self.fixture_dirs = (os.environ['FIXTURE_DIRS']).split(';')
+ self.fixture_dirs = (os.environ['FIXTURE_DIRS']).split(os.pathsep)
except KeyError:
pass
diff --git a/runtest.py b/runtest.py
index d4bc502..487100b 100755
--- a/runtest.py
+++ b/runtest.py
@@ -810,7 +810,7 @@ def run_test(t, io_lock, async=True):
if head:
fixture_dirs.append(head)
fixture_dirs.append(os.path.join(scriptpath, 'test', 'fixture'))
- os.environ['FIXTURE_DIRS'] = ';'.join(fixture_dirs)
+ os.environ['FIXTURE_DIRS'] = os.pathsep.join(fixture_dirs)
test_start_time = time_func()
if execute_tests: