diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-05 09:35:05 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-05 09:35:05 +0200 |
| commit | 14324ad4aa9582e07dc687dc63b1b886f2d272e5 (patch) | |
| tree | b8e4f081bdf935f5e313ad2ff907106c4663fa67 /tests | |
| parent | 01b683899f264608827b3a12acf92691d0e267c4 (diff) | |
| parent | e0c6f88fe51186eb6fc697ba74f60136bf2106e4 (diff) | |
Merge 1.13 into master
Change-Id: I277770ed530866f70c63c57b6f605ab49baf9d06
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 9e2e320c7..ca11e4e3e 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6647,7 +6647,9 @@ void TestBlackbox::badInterpreter() params.arguments = QStringList() << "-p" << "script-interp-noexec"; QCOMPARE(runQbs(params), 1); strerr = QString::fromLocal8Bit(m_qbsStderr); - QVERIFY(strerr.contains(reNoSuchFileOrDir) || strerr.contains(rePermissionDenied)); + QVERIFY2(strerr.contains(reNoSuchFileOrDir) || strerr.contains(rePermissionDenied) + || strerr.contains("script-noexec: bad interpreter: execve: Exec format error"), + qPrintable(strerr)); params.arguments = QStringList() << "-p" << "script-noexec"; QCOMPARE(runQbs(params), 1); diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index caf7cf0bc..e312c4493 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -110,8 +110,7 @@ void TestBlackboxAndroid::android() auto currentExpectedFilesLists = expectedFilesLists; const QString configArgument = "config:" + configName; QbsRunParameters resolveParams("resolve"); - resolveParams.arguments << "modules.Android.ndk.platform:android-21" << configArgument - << customProperties; + resolveParams.arguments << configArgument << customProperties; resolveParams.profile = p.name(); QCOMPARE(runQbs(resolveParams), 0); QbsRunParameters buildParams(QStringList{"--command-echo-mode", "command-line", |