From 0da5ade118a62b09c6da608e813237c63f0bed19 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Thu, 4 Aug 2022 09:46:40 +0200
Subject: [PATCH] Meson: Skip tests if meson is not installed

Change-Id: I118e687ff69c264e64e8a018ef6aa131f26463c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp | 4 ++++
 src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
index aae3ca3ca2c..35c9ed6b9cc 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
@@ -88,6 +88,10 @@ private slots:
                                                                + "/mesontest-XXXXXX");
         Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/'
                                                     + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH));
+
+        const auto path = MesonWrapper::find();
+        if (!path)
+            QSKIP("Meson not found");
     }
 
     void shouldListTargets_data()
diff --git a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
index 8e0edfbe667..6a8c8763096 100644
--- a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
+++ b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
@@ -55,6 +55,10 @@ private slots:
                                                                + "/mesontest-XXXXXX");
         Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/'
                                                     + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH));
+
+        const auto path = MesonWrapper::find();
+        if (!path)
+            QSKIP("Meson not found");
     }
 
     void shouldFindMesonFromPATH()