diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-02-13 16:53:37 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-02-16 09:52:15 +0000 |
| commit | 5819a73fa013a16f68449c4d5be54fbcfbf82902 (patch) | |
| tree | a38f072791e5d62ba95ac28138ba78f38cc8686c | |
| parent | f53d724eec925180e94cda4bd7db6b86eba0f82b (diff) | |
Adapt autotest so that it fails again.
Task-number: QBS-736
Change-Id: I94a4bd869f289e78816b56d5de974342cc463c6c
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
3 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs index b6da4e030..a3c117efd 100644 --- a/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs +++ b/tests/auto/blackbox/testdata/nested-properties/modules/higherlevel/higher-level.qbs @@ -2,5 +2,5 @@ import qbs Module { Depends { name: "lowerlevel" } - lowerlevel.prop: "value in higherlevel" + lowerlevel.propDependency: "value in higherlevel" } diff --git a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs index 07f896a69..269900704 100644 --- a/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs +++ b/tests/auto/blackbox/testdata/nested-properties/modules/lowerlevel/lower-level.qbs @@ -1,7 +1,9 @@ import qbs Module { - property string prop: "value in lowerlevel module" + property string propDependency: "value in lowerlevel module" + property string prop: propDependency + Rule { inputs: ["dummy-input"] Artifact { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 62c8a4dcd..19f52cb8d 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1926,6 +1926,7 @@ void TestBlackbox::nestedProperties() { QDir::setCurrent(testDataDir + "/nested-properties"); QCOMPARE(runQbs(), 0); + QEXPECT_FAIL(0, "QBS-736", Abort); QVERIFY2(m_qbsStdout.contains("value in higherlevel"), m_qbsStdout.constData()); } |