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

Meson: Dissolve WITH_UNCONFIGURED_PROJECT macro

Browse Source 
Only used once.

Change-Id: I74213ca13c694a53316c69ebc241608a876e2e8f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-25 14:26:26 +02:00
parent 3fe426e053
commit c4fbd6a3f7
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,17 +31,6 @@ static const ProjectData projectList[] =
{{"Simple C Project", "simplecproject", {"SimpleCProject"}}}; {{"Simple C Project", "simplecproject", {"SimpleCProject"}}};
#define WITH_UNCONFIGURED_PROJECT(_source_dir, _intro_file, ...) \
{ \
QTemporaryFile _intro_file; \
_intro_file.open(); \
const auto tool = findTool(ToolType::Meson); \
QVERIFY(tool.has_value()); \
const ToolWrapper _meson(ToolType::Meson, "name", *tool); \
run_meson(_meson.introspect(Utils::FilePath::fromString(_source_dir)), &_intro_file); \
__VA_ARGS__ \
}
class AMesonInfoParser : public QObject class AMesonInfoParser : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -83,7 +72,8 @@ private slots:
run_meson(meson.setup(FilePath::fromString(src_dir), buildDir)); run_meson(meson.setup(FilePath::fromString(src_dir), buildDir));
QVERIFY(isSetup(buildDir)); QVERIFY(isSetup(buildDir));
auto result = MesonInfoParser::parse(buildDir); MesonInfoParser::Result result = MesonInfoParser::parse(buildDir);
QStringList targetsNames; QStringList targetsNames;
std::transform(std::cbegin(result.targets), std::transform(std::cbegin(result.targets),
std::cend(result.targets), std::cend(result.targets),
@@ -92,23 +82,30 @@ private slots:
QVERIFY(targetsNames == expectedTargets); QVERIFY(targetsNames == expectedTargets);
} }
WITH_UNCONFIGURED_PROJECT(src_dir, introFile, { {
auto result = MesonInfoParser::parse(&introFile); // With unconfigured project
QTemporaryFile introFile;
introFile.open();
const auto tool = findTool(ToolType::Meson);
QVERIFY(tool.has_value());
const ToolWrapper meson(ToolType::Meson, "name", *tool);
run_meson(meson.introspect(Utils::FilePath::fromString(src_dir)), &introFile);
MesonInfoParser::Result result = MesonInfoParser::parse(&introFile);
QStringList targetsNames; QStringList targetsNames;
std::transform(std::cbegin(result.targets), std::transform(std::cbegin(result.targets),
std::cend(result.targets), std::cend(result.targets),
std::back_inserter(targetsNames), std::back_inserter(targetsNames),
[](const auto &target) { return target.name; }); [](const auto &target) { return target.name; });
QVERIFY(targetsNames == expectedTargets); QVERIFY(targetsNames == expectedTargets);
}) }
} }
void cleanupTestCase() void cleanupTestCase()
{ {
Utils::Singleton::deleteAll(); Utils::Singleton::deleteAll();
} }
private:
}; };
QTEST_GUILESS_MAIN(AMesonInfoParser) QTEST_GUILESS_MAIN(AMesonInfoParser)