diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-02 17:50:38 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-03 08:34:46 +0000 |
| commit | 76dc76862e5ba27f2fcc1f67e2ad1b0b2543b0ed (patch) | |
| tree | 5cc23471c9a3cbb438616d9ced06c4d054e49471 | |
| parent | 1ff2053031b3fa5b1a04be7c8f11c5ddf5e52de4 (diff) | |
Fix warnings in tst_blackbox::errorInfo
Set the name of the product in the test. Otherwise it will be named
"project" (because it resides in project.qbs) and confuse us with
warnings a la "Unknown property: project.fail1".
Change-Id: I03ac4cd12f339637455529979ea3dfc95971fe9f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | tests/auto/blackbox/testdata/error-info/project.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/blackbox/testdata/error-info/project.qbs b/tests/auto/blackbox/testdata/error-info/project.qbs index f2c65597f..a830be36c 100644 --- a/tests/auto/blackbox/testdata/error-info/project.qbs +++ b/tests/auto/blackbox/testdata/error-info/project.qbs @@ -11,6 +11,7 @@ Project { property bool fail7: false Product { + name: "myproduct" type: ["foo", "bar"] Rule { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 8c400cf5d..3ae49dd8c 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2133,19 +2133,19 @@ void TestBlackbox::errorInfo() params.arguments = QStringList() << "project.fail1:true"; QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("project.qbs:24"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("project.qbs:25"), m_qbsStderr); params.arguments = QStringList() << "project.fail2:true"; QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("project.qbs:36"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("project.qbs:37"), m_qbsStderr); params.arguments = QStringList() << "project.fail3:true"; QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("project.qbs:51"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("project.qbs:52"), m_qbsStderr); params.arguments = QStringList() << "project.fail4:true"; QVERIFY(runQbs(params) != 0); - QVERIFY2(m_qbsStderr.contains("project.qbs:66"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("project.qbs:67"), m_qbsStderr); params.arguments = QStringList() << "project.fail5:true"; QVERIFY(runQbs(params) != 0); @@ -2158,7 +2158,7 @@ void TestBlackbox::errorInfo() params.arguments = QStringList() << "project.fail7:true"; QVERIFY(runQbs(params) != 0); QVERIFY2(m_qbsStderr.contains("JavaScriptCommand.sourceCode"), m_qbsStderr); - QVERIFY2(m_qbsStderr.contains("project.qbs:57"), m_qbsStderr); + QVERIFY2(m_qbsStderr.contains("project.qbs:58"), m_qbsStderr); } void TestBlackbox::exportRule() |