From 72c0ff37fcb4b4cdcb07f3ca4b3ae8890c8ca2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 4 Jan 2024 13:25:49 +0100 Subject: [PATCH] SquishTests: Expect symlinked compilers e.g. /usr/bin/clang links to ../lib/llvm-14/bin/clang on Ubuntu 22.04. Change-Id: I6facd3126045036124e6c79ee83bc7575cbb02d7 Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_default_settings/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index 95391864c24..a91ddb5245d 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -207,7 +207,8 @@ def __getExpectedCompilers__(): for c in ('clang++', 'clang', 'afl-clang', 'clang-[0-9]', 'clang-[0-9].[0-9]', 'clang-1[0-9]', 'clang-1[0-9].[0-9]', '*g++*', '*gcc*'): - compilers.extend(findAllFilesInPATH(c)) + filesInPath = set(findAllFilesInPATH(c)) + compilers.extend(filesInPath | set(map(os.path.realpath, filesInPath))) if platform.system() == 'Darwin': for compilerExe in ('clang++', 'clang'): xcodeClang = getOutputFromCmdline(["xcrun", "--find", compilerExe]).strip("\n")