diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-12 15:35:12 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-14 11:39:00 +0200 |
| commit | b8b9759d55cb90322899fcec644f72d03dfdf6f0 (patch) | |
| tree | 27bba423cf33d2495b2a1cf478593d28f6013cb2 /tests/auto | |
| parent | 035da22bac999f70430a1645d132097bbd366f42 (diff) | |
Expose project source directory to JavaScript side.
Task-number: QBS-567
Change-Id: If2b09c42760426bf9d22c77a2f33083a1f839c94
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/blackbox/testdata/build-directories/project.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/build-directories/project.qbs b/tests/auto/blackbox/testdata/build-directories/project.qbs index 871c7a5c1..78490328e 100644 --- a/tests/auto/blackbox/testdata/build-directories/project.qbs +++ b/tests/auto/blackbox/testdata/build-directories/project.qbs @@ -34,6 +34,7 @@ Project { cmd.sourceCode = function() { print(product.buildDirectory); print(project.buildDirectory); + print(project.sourceDirectory); } return cmd; } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index da61bc9e2..e29df3614 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -274,10 +274,11 @@ void TestBlackbox::buildDirectories() QCOMPARE(runQbs(QStringList("-qq")), 0); const QStringList outputLines = QString::fromLocal8Bit(m_qbsStderr.trimmed()).split('\n', QString::SkipEmptyParts); - QCOMPARE(outputLines.count(), 3); + QCOMPARE(outputLines.count(), 4); QCOMPARE(outputLines.at(0).trimmed(), projectBuildDir + "/p1"); QCOMPARE(outputLines.at(1).trimmed(), projectBuildDir + "/p2"); QCOMPARE(outputLines.at(2).trimmed(), projectBuildDir); + QCOMPARE(outputLines.at(3).trimmed(), projectDir); } void TestBlackbox::build_project_data() |