diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-08 12:26:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-08 12:26:24 +0200 |
| commit | c84f4c258ef91c76e19198d7eeb64291d0171938 (patch) | |
| tree | cae0c810b276483edeef26baf71bd38a92a0a2a9 /tests/auto/blackbox/tst_blackbox.cpp | |
| parent | f69cd3ef989b77fce08a421190c549c4341f1e02 (diff) | |
| parent | ad11bb7383bf730ca0241af24a8b4179af157c7f (diff) | |
Merge 1.14 into master
Change-Id: Ief78bb9d82344e31135faca42a422c23951e87ec
Diffstat (limited to 'tests/auto/blackbox/tst_blackbox.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 3a90d8ccb..dd877637e 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -4267,7 +4267,8 @@ void TestBlackbox::symbolLinkMode() rmDirR(relativeBuildDir()); params.arguments = QStringList() << commonArgs << "project.lazy:true"; QCOMPARE(runQbs(params), 0); - QVERIFY2(m_qbsStdout.contains("meow\nLib was loaded!\n"), m_qbsStdout.constData()); + QVERIFY2(m_qbsStdout.contains("meow\n") && m_qbsStdout.contains("Lib was loaded!\n"), + m_qbsStdout.constData()); } } |