diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-22 12:19:14 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-22 12:21:40 +0200 |
| commit | 47266fefe5a9945b2cbf040ecffcc9a7021e876b (patch) | |
| tree | 5e5c7dde06232653a45a156dc4061cf389ac3cf0 /tests/auto/blackbox | |
| parent | 3eec1658c16fab1057a4cab0e0ef668fdc017f86 (diff) | |
| parent | 0b5de7277314db728a0b86e6f0ca5eeabc35306f (diff) | |
Merge remote-tracking branch 'origin/1.2'
Change-Id: I20fc0abcd4c6fa4bfb908d981399f75d50179e97
Diffstat (limited to 'tests/auto/blackbox')
3 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/fileDependencies/awesomelib/awesome.h b/tests/auto/blackbox/testdata/fileDependencies/awesomelib/awesome.h index 2c5d863ef..c98c806bb 100644 --- a/tests/auto/blackbox/testdata/fileDependencies/awesomelib/awesome.h +++ b/tests/auto/blackbox/testdata/fileDependencies/awesomelib/awesome.h @@ -1,7 +1,8 @@ #include <cstdio> +#include "magnificent.h" void doAwesomeStuff() { - printf("Just. Wow.\n"); + printf(magnificentMessage); } diff --git a/tests/auto/blackbox/testdata/fileDependencies/awesomelib/magnificent.h b/tests/auto/blackbox/testdata/fileDependencies/awesomelib/magnificent.h new file mode 100644 index 000000000..58fa39524 --- /dev/null +++ b/tests/auto/blackbox/testdata/fileDependencies/awesomelib/magnificent.h @@ -0,0 +1,6 @@ +#ifndef MAGNIFICENT_H +#define MAGNIFICENT_H + +const char magnificentMessage[] = "Just. Wow."; + +#endif // MAGNIFICENT_H diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index f4104ffab..c48eb0611 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1587,6 +1587,13 @@ void TestBlackbox::fileDependencies() QCOMPARE(runQbs(), 0); QVERIFY(m_qbsStdout.contains("compiling narf.cpp")); QVERIFY(!m_qbsStdout.contains("compiling zort.cpp")); + + // Incremental build with changed 2nd level file dependency. + waitForNewTimestamp(); + touch("awesomelib/magnificent.h"); + QCOMPARE(runQbs(), 0); + QVERIFY(m_qbsStdout.contains("compiling narf.cpp")); + QVERIFY(!m_qbsStdout.contains("compiling zort.cpp")); } void TestBlackbox::jsExtensionsFile() |