summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrbd <garlicbready@googlemail.com>2017-06-20 23:45:37 (GMT)
committergrbd <garlicbready@googlemail.com>2017-06-20 23:45:37 (GMT)
commit4024bd986cde1fd161e4ae77357f6f84fffa2c16 (patch)
tree7963aa7e7ec6888c2afe1abb824b85720c5e0ccd
parentd98628e6087769b413d05d34c01d7f54edba7fbc (diff)
downloadSCons-4024bd986cde1fd161e4ae77357f6f84fffa2c16.zip
SCons-4024bd986cde1fd161e4ae77357f6f84fffa2c16.tar.gz
SCons-4024bd986cde1fd161e4ae77357f6f84fffa2c16.tar.bz2
Fix the directory seperator for Fixture directories to be windows compatible
-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 66d6b23..17a9eda 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(';')
except KeyError:
pass
diff --git a/runtest.py b/runtest.py
index 18d4121..d4bc502 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'] = ';'.join(fixture_dirs)
test_start_time = time_func()
if execute_tests: