Squish: Fix compiler detection

Find clang and clang++ in more than one location. If they could
be found in more than a single path provided inside PATH we
expected only the first occurrence.

Change-Id: Ibcd7b7b6dff1153fd4b52b055c0fb2a0c5d9d7fc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>

1 files changed, 3 insertions, 5 deletions

diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index 2956f4acbb..9a15e2b8fa 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -209,11 +209,9 @@ def __getExpectedCompilers__():
         expected.extend(__getWinCompilers__())
     compilers = ["g++", "gcc"]
     if platform.system() in ('Linux', 'Darwin'):
-        compilers.extend(["clang++", "clang", "afl-clang"])
-        compilers.extend(findAllFilesInPATH("clang-[0-9]"))
-        compilers.extend(findAllFilesInPATH("clang-[0-9].[0-9]"))
-        compilers.extend(findAllFilesInPATH("*g++*"))
-        compilers.extend(findAllFilesInPATH("*gcc*"))
+        for c in ('clang++', 'clang', 'afl-clang', 'clang-[0-9]', 'clang-[0-9].[0-9]',
+                  '*g++*', '*gcc*'):
+            compilers.extend(findAllFilesInPATH(c))
     if platform.system() == 'Darwin':
         for compilerExe in ('clang++', 'clang'):
             xcodeClang = getOutputFromCmdline(["xcrun", "--find", compilerExe]).strip("\n")