diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-02-17 09:08:48 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-02-17 14:06:31 +0000 |
| commit | 4205134847da5cbb7ef766622688d74cc3be947b (patch) | |
| tree | 4e60239d8d15cca9a735f5ab88dd9fe15a35700b /tests | |
| parent | da42176da8401855688c333f02b583e8154aa95f (diff) | |
Squish: Fix compiler toolchains on macOS
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/settings/mac/QtProject/qtcreator/toolchains.xml | 12 | ||||
| -rw-r--r-- | tests/system/shared/qtcreator.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml index 411027599d..ac3136362c 100644 --- a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml @@ -9,7 +9,7 @@ <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-32bit</value> - <value type="QString">x86-macos-generic-mach_o-64bit</value> + <value type="QString">x86-darwin-generic-mach_o-64bit</value> </valuelist> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> @@ -23,8 +23,8 @@ <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> - <value type="QString">x86-macos-generic-mach_o-64bit</value> - <value type="QString">x86-macos-generic-mach_o-32bit</value> + <value type="QString">x86-darwin-generic-mach_o-64bit</value> + <value type="QString">x86-darwin-generic-mach_o-32bit</value> </valuelist> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> @@ -38,8 +38,8 @@ <valuemap type="QVariantMap"> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> - <value type="QString">x86-macos-generic-mach_o-64bit</value> - <value type="QString">x86-macos-generic-mach_o-32bit</value> + <value type="QString">x86-darwin-generic-mach_o-64bit</value> + <value type="QString">x86-darwin-generic-mach_o-32bit</value> </valuelist> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> @@ -55,7 +55,7 @@ <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-32bit</value> - <value type="QString">x86-macos-generic-mach_o-64bit</value> + <value type="QString">x86-darwin-generic-mach_o-64bit</value> </valuelist> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 295a9ed2cf..76dbd7071d 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -212,7 +212,7 @@ def __guessABI__(supportedABIs, use64Bit): if platform.system() == 'Linux': supportedABIs = filter(lambda x: 'linux' in x, supportedABIs) elif platform.system() == 'Darwin': - supportedABIs = filter(lambda x: 'macos' in x, supportedABIs) + supportedABIs = filter(lambda x: 'darwin' in x, supportedABIs) if use64Bit: searchFor = "64bit" else: |