Commit 57568f98 authored by Kai Koehne's avatar Kai Koehne
Browse files

qtattributionsscanner: Add test mode


Rename test qt_attribution.json files to qt_attribution_test.json.
This avoids warnings when picking up the test files in normal mode.

Change-Id: I8831a81c84986c074d3519d2855c00987b4c2570
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
Showing with 16 additions and 9 deletions
......@@ -195,7 +195,11 @@ QVector<Package> scanDirectory(const QString &directory, LogLevel logLevel)
QDir dir(directory);
QVector<Package> packages;
dir.setNameFilters(QStringList() << QStringLiteral("qt_attribution.json"));
QStringList nameFilters = QStringList()
<< QStringLiteral("qt_attribution.json");
if (qEnvironmentVariableIsSet("QT_ATTRIBUTIONSSCANNER_TEST"))
nameFilters << QStringLiteral("qt_attribution_test.json");
dir.setNameFilters(nameFilters);
dir.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Files);
const QFileInfoList entries = dir.entryInfoList();
......
File %{PWD}/qt_attribution.json: Missing mandatory property 'Name'.
File %{PWD}/qt_attribution.json: Missing mandatory property 'Id'.
File %{PWD}/qt_attribution.json: Missing mandatory property 'QDocModule'.
File %{PWD}/qt_attribution.json: Missing mandatory property 'QtUsage'.
File %{PWD}/qt_attribution.json: Missing mandatory property 'License'.
File %{PWD}/qt_attribution.json: Missing mandatory property 'Copyright'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Name'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Id'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QDocModule'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QtUsage'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'License'.
File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Copyright'.
File %{PWD}/qt_attribution.json: Unknown key Unknown.
File %{PWD}/qt_attribution_test.json: Unknown key Unknown.
......@@ -81,7 +81,7 @@ void tst_qtattributionsscanner::test_data()
<< QStringLiteral("warnings/unknown/expected.json")
<< QStringLiteral("warnings/unknown/expected.error");
QTest::newRow("singlefile")
<< QStringLiteral("good/minimal/qt_attribution.json")
<< QStringLiteral("good/minimal/qt_attribution_test.json")
<< QStringLiteral("good/minimal/expected.json")
<< QStringLiteral("good/minimal/expected.error");
}
......@@ -106,6 +106,9 @@ void tst_qtattributionsscanner::test()
QProcess proc;
QString command = m_cmd + " " + dir + " --output-format json";
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("QT_ATTRIBUTIONSSCANNER_TEST", "1");
proc.setProcessEnvironment(env);
proc.start(command, QIODevice::ReadWrite | QIODevice::Text);
QVERIFY2(proc.waitForStarted(), qPrintable(command + QLatin1String(" :") + proc.errorString()));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment