diff options
| author | William Blevins <wblevins001@gmail.com> | 2016-09-23 02:13:44 -0400 |
|---|---|---|
| committer | William Blevins <wblevins001@gmail.com> | 2016-09-23 02:13:44 -0400 |
| commit | 456aa2a602e7dc610ca0beeaee7ce68be2dc356d (patch) | |
| tree | b9e1870afd2bbb9196c559a48b18a9e37f398539 /QMTest | |
| parent | eb8a1e84f775e6fa46f71ec17a33ac51b35f94da (diff) | |
| download | scons-456aa2a602e7dc610ca0beeaee7ce68be2dc356d.tar.gz | |
Initial python3 cut of test/Fortran.
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestCmd.py | 10 | ||||
| -rw-r--r-- | QMTest/TestSCons.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 109c83a0..370101bb 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -1251,12 +1251,12 @@ class TestCmd(object): if srcdir and self.fixture_dirs and not os.path.isabs(srcdir): for dir in self.fixture_dirs: - spath = os.path.join(self.fixture_dirs, srcdir) + spath = os.path.join(dir, srcdir) if os.path.isdir(spath): - continue - + break else: spath = srcdir + if dstdir: dstdir = self.canonicalize(dstdir) else: @@ -1295,9 +1295,9 @@ class TestCmd(object): spath = srcfile else: for dir in self.fixture_dirs: - spath = os.path.join(self.fixture_dirs, srcfile) + spath = os.path.join(dir, srcfile) if os.path.isfile(spath): - continue + break if not dstfile: if srctail: diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index f02ddd8b..a987c5a3 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -268,7 +268,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 |