Differential D19673 Diff 53636 plugins/cmake/cmakeutils.cpp

Changeset View

Standalone View

View Options

plugins/cmake/cmakeutils.cpp

Context not available.
691 return defGen; 691​ return defGen;
692} 692​}
693 693​
694QVector<Test> importTestSuites(const Path &buildDir) 694​QVector<Test> importTestSuites(const Path &buildDir, const QString & CMakeTestFileName)
mwolffUnsubmitted
Done

then add this function here (with the style fixes mentioned above), and have importTestSuites defer to it via

QVector<Test> importTestSuites(const Path &buildDir)
{
    return importTestSuites(buildDir, QStringLiteral("CTestTestfile.cmake"));
}
mwolff: then add this function here (with the style fixes mentioned above), and have importTestSuites…
tnorthAuthorUnsubmitted
Not Done

Do you want importTestSuites(buildDir, QStringLiteral("CTestTestfile.cmake")) also exported in the .h file?

tnorth: Do you want importTestSuites(buildDir, QStringLiteral("CTestTestfile.cmake")) also exported in…
695{ 695​{
696 const auto contents = CMakeListsParser::readCMakeFile(buildDir.toLocalFile() + QLatin1String("/CTestTestfile.cmake")); 696​ auto CMakeTestFile = Path(buildDir, CMakeTestFileName).toLocalFile() ;
mwolffUnsubmitted
Done

const and lower-case the start

mwolff: const and lower-case the start
mwolffUnsubmitted
Not Done

style: remove spaces before;

mwolff: style: remove spaces before;
697 697​ const auto contents = CMakeListsParser::readCMakeFile(CMakeTestFile);
698​
698 QVector<Test> tests; 699​ QVector<Test> tests;
699 for (const auto& entry: contents) { 700​ for (const auto& entry: contents) {
700 if (entry.name == QLatin1String("add_test")) { 701​ if (entry.name == QLatin1String("add_test")) {
701 auto args = entry.arguments; 702​ auto args = entry.arguments;
702 703​
703 Test test; 704​ Test test;
704 test.name = args.takeFirst().value; 705​ test.name = args.takeFirst().value;
705 test.executable = args.takeFirst().value; 706​ test.executable = args.takeFirst().value;
706 test.arguments = kTransform<QStringList>(args, [](const CMakeFunctionArgument& arg) { return arg.value; }); 707​ test.arguments = kTransform<QStringList>(args, [](const CMakeFunctionArgument& arg) { return arg.value; });
708​
707 tests += test; 709​ tests += test;
708 } else if (entry.name == QLatin1String("subdirs")) { 710​ } else if (entry.name == QLatin1String("subdirs")) {
709 tests += importTestSuites(Path(buildDir, entry.arguments.first().value)); 711​ tests += importTestSuites(Path(buildDir, entry.arguments.first().value));
712​ } else if (entry.name == QLatin1String("include")) {
713​ // Include directive points directly to a .cmake file hosting the tests
714​ tests += importTestSuites(Path(buildDir, entry.arguments.first().value), QStringLiteral(""));
mwolffUnsubmitted
Done

QString() or {} instead of empty string literal

mwolff: `QString()` or `{}` instead of empty string literal
710 } else if (entry.name == QLatin1String("set_tests_properties")) { 715​ } else if (entry.name == QLatin1String("set_tests_properties")) {
711 if(entry.arguments.count() < 4 || entry.arguments.count() % 2) { 716​ if(entry.arguments.count() < 4 || entry.arguments.count() % 2) {
712 qCWarning(CMAKE) << "found set_tests_properties() with unexpected number of arguments:" 717​ qCWarning(CMAKE) << "found set_tests_properties() with unexpected number of arguments:"
Context not available.
mwolffUnsubmitted
Not Done

style: move { to its own line for function bodies

mwolff: style: move { to its own line for function bodies