diff --git a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp index e25fec5456e..aae3ca3ca2c 100644 --- a/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp +++ b/src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -56,7 +57,9 @@ static const QList projectList{ #define WITH_CONFIGURED_PROJECT(_source_dir, _build_dir, ...) \ { \ QTemporaryDir _build_dir{"test-meson"}; \ - const auto _meson = MesonWrapper("name", *MesonWrapper::find()); \ + const auto tool = MesonWrapper::find(); \ + QVERIFY(tool.has_value()); \ + const auto _meson = MesonWrapper("name", *tool); \ run_meson(_meson.setup(Utils::FilePath::fromString(_source_dir), \ Utils::FilePath::fromString(_build_dir.path()))); \ QVERIFY(isSetup(Utils::FilePath::fromString(_build_dir.path()))); \ @@ -67,7 +70,9 @@ static const QList projectList{ { \ QTemporaryFile _intro_file; \ _intro_file.open(); \ - const auto _meson = MesonWrapper("name", *MesonWrapper::find()); \ + const auto tool = MesonWrapper::find(); \ + QVERIFY(tool.has_value()); \ + const auto _meson = MesonWrapper("name", *tool); \ run_meson(_meson.introspect(Utils::FilePath::fromString(_source_dir)), &_intro_file); \ __VA_ARGS__ \ } @@ -79,6 +84,8 @@ class AMesonInfoParser : public QObject private slots: void initTestCase() { + Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + + "/mesontest-XXXXXX"); Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/' + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH)); } @@ -126,5 +133,5 @@ private slots: private: }; -QTEST_MAIN(AMesonInfoParser) +QTEST_GUILESS_MAIN(AMesonInfoParser) #include "testmesoninfoparser.moc" diff --git a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp index 6a003cc45dc..6a3b34df318 100644 --- a/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp +++ b/src/plugins/mesonprojectmanager/tests/testmesonparser.cpp @@ -296,6 +296,6 @@ private slots: void cleanupTestCase() {} }; -QTEST_MAIN(AMesonOutputParser) +QTEST_GUILESS_MAIN(AMesonOutputParser) #include "testmesonparser.moc" diff --git a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp index 7db2c49480d..8e0edfbe667 100644 --- a/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp +++ b/src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -50,6 +51,8 @@ class AMesonWrapper : public QObject private slots: void initTestCase() { + Utils::TemporaryDirectory::setMasterTemporaryDirectory(QDir::tempPath() + + "/mesontest-XXXXXX"); Utils::LauncherInterface::setPathToLauncher(qApp->applicationDirPath() + '/' + QLatin1String(TEST_RELATIVE_LIBEXEC_PATH)); } @@ -120,5 +123,5 @@ private slots: private: }; -QTEST_MAIN(AMesonWrapper) +QTEST_GUILESS_MAIN(AMesonWrapper) #include "testmesonwrapper.moc" diff --git a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp index 321eb02e3ae..f2281a35caa 100644 --- a/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp +++ b/src/plugins/mesonprojectmanager/tests/testninjaparser.cpp @@ -108,5 +108,5 @@ private slots: void cleanupTestCase() {} }; -QTEST_MAIN(ANinjaParser) +QTEST_GUILESS_MAIN(ANinjaParser) #include "testninjaparser.moc"