From e3aad67ce5b163fe403ce7c1ae5c239584b1cc2a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 23 Mar 2022 09:09:36 +0100
Subject: [PATCH] sdktool: Clean up AddAbiFlavor test

Suppress expected output.
Split complex 'if' for easier debugging.

Task-number: QTCREATORBUG-27227
Change-Id: I9bc305d3aacd79f6097e92f54951aec2a45d28a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/tools/sdktool/addabiflavor.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/tools/sdktool/addabiflavor.cpp b/src/tools/sdktool/addabiflavor.cpp
index c7fde38a62a..5deeea7c899 100644
--- a/src/tools/sdktool/addabiflavor.cpp
+++ b/src/tools/sdktool/addabiflavor.cpp
@@ -33,11 +33,13 @@
 
 #include "settings.h"
 
+#include <QtTest>
+
 #include <iostream>
 
-static char VERSION[] = "Version";
-static char FLAVORS[] = "Flavors";
-static char ABI_FILE_ID[] = "abi";
+const char VERSION[] = "Version";
+const char FLAVORS[] = "Flavors";
+const char ABI_FILE_ID[] = "abi";
 
 QString AddAbiFlavor::name() const
 {
@@ -109,24 +111,30 @@ int AddAbiFlavor::execute() const
 bool AddAbiFlavor::test() const
 {
     QVariantMap map = initializeAbiFlavors();
-    if (map.count() != 1
-            || !map.contains(QLatin1String(VERSION)))
+    if (map.count() != 1)
+        return false;
+    if (!map.contains(QLatin1String(VERSION)))
         return false;
 
     map = AddAbiFlavorData{{"linux", "windows"}, "foo"}.addAbiFlavor(map);
 
-    if (map.count() != 2
-            || !map.contains(QLatin1String(VERSION))
-            || !map.contains(QLatin1String(FLAVORS)))
+    if (map.count() != 2)
+        return false;
+    if (!map.contains(QLatin1String(VERSION)))
+        return false;
+    if (!map.contains(QLatin1String(FLAVORS)))
         return false;
 
     const QVariantMap flavorMap = map.value(QLatin1String(FLAVORS)).toMap();
-    if (flavorMap.count() != 1
-            || flavorMap.value("foo").toStringList() != QStringList({"linux", "windows"}))
+    if (flavorMap.count() != 1)
+        return false;
+    if (flavorMap.value("foo").toStringList() != QStringList({"linux", "windows"}))
         return false;
 
     // Ignore known flavors:
-    const QVariantMap result = AddAbiFlavorData({{"linux"}, "foo"}).addAbiFlavor(map);;
+    QTest::ignoreMessage(QtWarningMsg,
+                         QRegularExpression("Error: flavor .* already defined as extra ABI flavor."));
+    const QVariantMap result = AddAbiFlavorData({{"linux"}, "foo"}).addAbiFlavor(map);
 
     if (map != result)
         return false;