aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-11-04 17:37:51 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-11-05 09:16:07 +0000
commit3e5268b08883eb98ab539887d63985f149e02241 (patch)
tree681c79495ca706e1988a1edecb4428193006a81f /tests
parent77719b58932541e63d926ee9f454163c57273670 (diff)
Fix user dependency scanners
Since commit 9e55ddfa97, we mistakenly passed the output artifact to the scan script, rather than the input artifact. Fixes: QBS-1511 Change-Id: Ieb2a2b3bdf0366ef203e96d578a30a0ef8b1838a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/tst_blackboxqt.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index 2b2b6814e..474fb95f3 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -371,6 +371,16 @@ void TestBlackboxQt::quickCompiler()
QCOMPARE(m_qbsStdout.contains("compiling qml_subdir_test_qml.cpp"), hasCompiler);
if (doesNotHaveCompiler)
QSKIP("qtquickcompiler not available");
+ QVERIFY2(m_qbsStdout.contains("generating loader source"), m_qbsStdout.constData());
+
+ QCOMPARE(runQbs(), 0);
+ QVERIFY2(!m_qbsStdout.contains("generating loader source"), m_qbsStdout.constData());
+
+ WAIT_FOR_NEW_TIMESTAMP();
+ touch("qml/subdir/test.qml");
+ QCOMPARE(runQbs(), 0);
+ QVERIFY2(m_qbsStdout.contains("generating loader source"), m_qbsStdout.constData());
+
QCOMPARE(runQbs(QbsRunParameters(QStringList{"config:off",
"modules.Qt.quick.useCompiler:false"})), 0);
QVERIFY2(m_qbsStdout.contains("compiling"), m_qbsStdout.constData());