From 4967ba7fe355283654561d02417564de82649f7e Mon Sep 17 00:00:00 2001 From: grbd Date: Wed, 21 Jun 2017 01:15:23 +0100 Subject: Changed to os.pathsep for fixture dirs --- QMTest/TestSCons.py | 2 +- runtest.py | 2 +- 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: -- cgit v0.12