diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-09 13:06:22 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-09 13:06:22 +0200 |
commit | da9b8b60848afad84e4a9a8452480a88ab948bb8 (patch) | |
tree | 6b6915403524c70957671430e04d8c587384302d /tests | |
parent | 5500aca86669ec9a6f4440fe0438850297451c90 (diff) | |
parent | c96755ea7eede1f1881e00718fc03c3f5f693c33 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ifa1d05c3f578d04db599c68ec96ef343e293fd51
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json (renamed from tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json) | 0 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution_test.json (renamed from tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json) | 0 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error | 12 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution_test.json (renamed from tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json) | 0 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/unknown/expected.error | 2 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution_test.json (renamed from tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json) | 0 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp | 5 |
7 files changed, 11 insertions, 8 deletions
diff --git a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json b/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution_test.json index f8e7b1c68..f8e7b1c68 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/complete/qt_attribution.json +++ b/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 index 2dc53f852..2dc53f852 100644 --- a/tests/auto/qtattributionsscanner/testdata/good/minimal/qt_attribution.json +++ b/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 e18d2976b..7095bf1a2 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 index 2c63c0851..2c63c0851 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/qt_attribution.json +++ b/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 89b48074b..2cc0102a7 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 index f1d55638c..f1d55638c 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/unknown/qt_attribution.json +++ b/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 7740fde9b..7789ad5f7 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())); |