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

Meson: Merge ToolWrapper classes

Browse Source 
Change-Id: I140088263059944b39c913acd1df07312b249953
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-22 17:27:50 +02:00
parent 36a6fa1664
commit ed10d7a449
9 changed files with 64 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,9 @@
#include <QTemporaryDir>
#include <QtTest/QtTest>
#include <iostream>
using namespace MesonProjectManager::Internal;
namespace {
static const QList<QPair<const char *, QString>> projectList{{"Simple C Project", "simplecproject"}};
} // namespace
static const QPair<const char *, QString> projectList[] = {{"Simple C Project", "simplecproject"}};
class AMesonWrapper : public QObject
{
@@ -69,7 +65,7 @@ private slots:
{
QFETCH(QString, src_dir);
QTemporaryDir build_dir{"test-meson"};
const MesonWrapper meson(ToolType::Meson, "name", *findMesonTool());
const ToolWrapper meson(ToolType::Meson, "name", *findMesonTool());
QVERIFY(run_meson(meson.setup(Utils::FilePath::fromString(src_dir),
Utils::FilePath::fromString(build_dir.path()))));
QVERIFY(
@@ -90,7 +86,7 @@ private slots:
{
QFETCH(QString, src_dir);
QTemporaryDir build_dir{"test-meson"};
const MesonWrapper meson(ToolType::Meson, "name", *findMesonTool());
const ToolWrapper meson(ToolType::Meson, "name", *findMesonTool());
QVERIFY(run_meson(meson.setup(Utils::FilePath::fromString(src_dir),
Utils::FilePath::fromString(build_dir.path()))));
QVERIFY(run_meson(meson.configure(Utils::FilePath::fromString(src_dir),
@@ -101,8 +97,6 @@ private slots:
{
Utils::Singleton::deleteAll();
}
private:
};
QTEST_GUILESS_MAIN(AMesonWrapper)