aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-04-03 15:08:23 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-04-05 07:34:30 +0000
commit412d81bca2bcb7bf36632770a256f6c6b80facee (patch)
treeaf0ab717e44e74614fc682f25453673691e51859
parent025eeaa0050fe29e63e4bb715fda7a9a03b291da (diff)
Fix badInterpreter autotest
I now get a different error message after a system update. Change-Id: Ic403e065c80e9297eadb636faf06a057d9328be6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp4
1 files changed, 3 insertions, 1 deletions
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);