From 412d81bca2bcb7bf36632770a256f6c6b80facee Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 3 Apr 2019 15:08:23 +0200 Subject: Fix badInterpreter autotest I now get a different error message after a system update. Change-Id: Ic403e065c80e9297eadb636faf06a057d9328be6 Reviewed-by: Joerg Bornemann --- tests/auto/blackbox/tst_blackbox.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 8dd79528b..bc187b210 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); -- cgit v1.2.3 From e0c6f88fe51186eb6fc697ba74f60136bf2106e4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 4 Apr 2019 10:31:53 +0200 Subject: Android: Auto-detect Android.ndk.platform ... the same way as Android.sdk.platform. Change-Id: I974fdfd9f56f312cbd39ea155d87694622a9c0b8 Reviewed-by: Joerg Bornemann --- tests/auto/blackbox/tst_blackboxandroid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') 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", -- cgit v1.2.3