diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp index d7d95813821b0e01f3e253167b2118edf8fb0b41..86450dd9e46394a6511e76e6059f2d582abfbc16 100644 --- a/src/qtattributionsscanner/scanner.cpp +++ b/src/qtattributionsscanner/scanner.cpp @@ -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(); diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json similarity index 100% rename from tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json rename to tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json diff --git a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json similarity index 100% rename from tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json rename to tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index e18d2976bb57ed5a53dcd7505cc43ba55c061613..7095bf1a2be31431f7226ac795f89c894f022483 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,6 +1,6 @@ -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'. diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json similarity index 100% rename from tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json rename to tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error index 89b48074b05b0a5ccaff99ed4f5b7d500d1f6232..2cc0102a78b8f1571759584e94e79e58ae6dba69 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error @@ -1 +1 @@ -File %{PWD}/qt_attribution.json: Unknown key Unknown. +File %{PWD}/qt_attribution_test.json: Unknown key Unknown. diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json similarity index 100% rename from tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json rename to tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp index 7740fde9bb89758a328d57702333561a54021a85..7789ad5f755c46dbd715ed71117c592e4c19e0a4 100644 --- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp +++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp @@ -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()));