From 476f67cce5797bd9639c3bc3e29c332af64557c0 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 1 Feb 2023 14:42:24 +0100 Subject: [PATCH] SquishTests: Fix default settings test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depending on the presence of the llvm that had been used when building QC we need to expect its clang. Use special environment variable to be able to do this correctly. Change-Id: I2497bbd96483f37aa90842d7fffa5d0a8103ff45 Reviewed-by: Robert Löhning --- tests/system/suite_general/tst_default_settings/test.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index c8814d8eef1..ebb8ef0dd46 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -31,6 +31,13 @@ def __checkKits__(): mouseClick(waitForObjectItem(":Options_QListView", "Kits")) # check compilers expectedCompilers = __getExpectedCompilers__() + llvmForBuild = os.getenv("SYSTEST_LLVM_FROM_BUILD", None) + if llvmForBuild is not None: + internalClangExe = os.path.join(llvmForBuild, "bin", "clang") + if platform.system() in ("Microsoft", "Windows"): + internalClangExe.append(".exe") + if os.path.exists(internalClangExe): + expectedCompilers.append(internalClangExe) foundCompilers = [] foundCompilerNames = [] clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Compilers")