Commit 38d307ff authored by Christian Stenger's avatar Christian Stenger

Squish: Adapt test to improved compiler detection

QC now finds some more compilers.

Change-Id: Icbf8d29a24c3360d2d7d8ed73011f705dd156aa8
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
parent 17f44b5a
......@@ -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),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment