From 38d307ffb84e4c945682263e2e006ddf23aed857 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 11 Oct 2017 15:20:31 +0200
Subject: [PATCH] Squish: Adapt test to improved compiler detection
QC now finds some more compilers.
Change-Id: Icbf8d29a24c3360d2d7d8ed73011f705dd156aa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
---
tests/system/suite_general/tst_default_settings/test.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index 23487e4bd40..a4230fe17fa 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -184,7 +184,9 @@ def __getExpectedCompilers__():
expected.extend(__getWinCompilers__())
compilers = ["g++", "gcc"]
if platform.system() in ('Linux', 'Darwin'):
- compilers.extend(["g++-4.0", "g++-4.2", "clang++", "clang"])
+ compilers.extend(["clang++", "clang"])
+ compilers.extend(findAllFilesInPATH("*g++*"))
+ compilers.extend(findAllFilesInPATH("*gcc*"))
if platform.system() == 'Darwin':
xcodeClang = getOutputFromCmdline(["xcrun", "--find", "clang++"]).strip("\n")
if xcodeClang and os.path.exists(xcodeClang) and xcodeClang not in expected:
@@ -333,7 +335,6 @@ def __checkCreatedSettings__(settingsFolder):
{os.path.join(folders[0], "qtversion.xml"):0},
{os.path.join(folders[0], "toolchains.xml"):0}])
folders.extend([os.path.join(folders[0], "generic-highlighter"),
- os.path.join(folders[0], "json"),
os.path.join(folders[0], "macros")])
for f in folders:
test.verify(os.path.isdir(f),
--
GitLab