diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-26 09:40:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-26 09:43:03 +0200 |
| commit | a1a8cf65b7426d9466f6340cfeb162f2d0787de2 (patch) | |
| tree | 31b1230930cf3ca8cf8c33ae73b5e4e4f57d3b88 /testing/runner.py | |
| parent | 3f8c8702ea295f39357e7c66f46e5138f56bcc9f (diff) | |
| parent | e0a8f2dfb759ef4eff542d0a317a9370d4eddc52 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I0c5b60263ed642a9b6f6b5d6a1492a11f278bfd5
Diffstat (limited to 'testing/runner.py')
| -rw-r--r-- | testing/runner.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testing/runner.py b/testing/runner.py index 945e32469..3c99df71c 100644 --- a/testing/runner.py +++ b/testing/runner.py @@ -61,7 +61,7 @@ this_dir = os.path.dirname(this_file) build_scripts_dir = os.path.abspath(os.path.join(this_dir, '../build_scripts')) sys.path.append(build_scripts_dir) -from utils import detectClang +from utils import detect_clang class TestRunner(object): def __init__(self, log_entry, project, index): @@ -74,19 +74,19 @@ class TestRunner(object): else: self.logfile = os.path.join(log_dir, project + ".log") os.environ['CTEST_OUTPUT_ON_FAILURE'] = '1' - self._setupClang() + self._setup_clang() self._setup() - def _setupClang(self): + def _setup_clang(self): if sys.platform != "win32": return - clangDir = detectClang() - if clangDir[0]: - clangBinDir = os.path.join(clangDir[0], 'bin') + clang_dir = detect_clang() + if clang_dir[0]: + clang_bin_dir = os.path.join(clang_dir[0], 'bin') path = os.environ.get('PATH') - if not clangBinDir in path: - os.environ['PATH'] = clangBinDir + os.pathsep + path - print("Adding %s as detected by %s to PATH" % (clangBinDir, clangDir[1])) + if not clang_bin_dir in path: + os.environ['PATH'] = clang_bin_dir + os.pathsep + path + print("Adding %s as detected by %s to PATH" % (clang_bin_dir, clang_dir[1])) def _find_ctest(self): """ |