diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-26 15:53:35 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-06-26 15:55:32 +0200 |
| commit | 7c975c2fda2ef06af0532a73dc287657447e20d6 (patch) | |
| tree | 7ce17d6beae3ad57881b86a0998ee8b28b528393 /tests/auto | |
| parent | 5e77a9d1927ec4f3ab405824a92d48930d48c487 (diff) | |
Add failing autotest for QBS-635.
Task-number: QBS-635
Change-Id: I30dc4b0694efa0417d340a75368b3af1eb117daa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/auto')
5 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/broken.cpp b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/broken.cpp new file mode 100644 index 000000000..57f89ed17 --- /dev/null +++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/broken.cpp @@ -0,0 +1 @@ +broken diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/fine.cpp b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/fine.cpp new file mode 100644 index 000000000..237c8ce18 --- /dev/null +++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/fine.cpp @@ -0,0 +1 @@ +int main() {} diff --git a/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/project.qbs b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/project.qbs new file mode 100644 index 000000000..97f1e9897 --- /dev/null +++ b/tests/auto/blackbox/testdata/non-broken-files-in-broken-product/project.qbs @@ -0,0 +1,5 @@ +import qbs + +CppApplication { + files: ["fine.cpp", "broken.cpp"] +} diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 95e7190da..f6a8f0818 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1772,6 +1772,18 @@ void TestBlackbox::mocCppIncluded() QCOMPARE(runQbs(), 0); } +void TestBlackbox::nonBrokenFilesInBrokenProduct() +{ + QDir::setCurrent(testDataDir + "/non-broken-files-in-broken-product"); + QbsRunParameters params("-k"); + params.expectFailure = true; + QVERIFY(runQbs(params) != 0); + QVERIFY(m_qbsStdout.contains("fine.cpp")); + QVERIFY(runQbs(params) != 0); + QEXPECT_FAIL("", "QBS-635", Continue); + QVERIFY(!m_qbsStdout.contains("fine.cpp")); // The non-broken file must not be recompiled. +} + void TestBlackbox::objC() { QDir::setCurrent(testDataDir + "/objc"); diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h index c80e2e046..9b16e7e82 100644 --- a/tests/auto/blackbox/tst_blackbox.h +++ b/tests/auto/blackbox/tst_blackbox.h @@ -126,6 +126,7 @@ private slots: void jsExtensionsTextFile(); void inheritQbsSearchPaths(); void mocCppIncluded(); + void nonBrokenFilesInBrokenProduct(); void objC(); void qmlDebugging(); void projectWithPropertiesItem(); |