From 4205134847da5cbb7ef766622688d74cc3be947b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Mon, 17 Feb 2020 09:08:48 +0100
Subject: Squish: Fix compiler toolchains on macOS

Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
---
 tests/system/settings/mac/QtProject/qtcreator/toolchains.xml | 12 ++++++------
 tests/system/shared/qtcreator.py                             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests')

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:
-- 
cgit v1.2.3