feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Meson: Skip tests if meson is not installed

Browse Source 
Change-Id: I118e687ff69c264e64e8a018ef6aa131f26463c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2022-08-04 09:46:40 +02:00
parent a6e545fa53
commit 0da5ade118
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp
View File

@@ -88,6 +88,10 @@ private slots:
+ "/mesontest-XXXXXX"); + "/mesontest-XXXXXX");
Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/' Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/'
+ QLatin1String(TEST_RELATIVE_LIBEXEC_PATH)); + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH));
const auto path = MesonWrapper::find();
if (!path)
QSKIP("Meson not found");
} }
void shouldListTargets_data() void shouldListTargets_data()

4
src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp
View File

@@ -55,6 +55,10 @@ private slots:
+ "/mesontest-XXXXXX"); + "/mesontest-XXXXXX");
Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/' Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/'
+ QLatin1String(TEST_RELATIVE_LIBEXEC_PATH)); + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH));
const auto path = MesonWrapper::find();
if (!path)
QSKIP("Meson not found");
} }
void shouldFindMesonFromPATH() void shouldFindMesonFromPATH()