diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-04-26 14:27:13 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-27 14:17:46 +0000 |
commit | db3ace204709ced8cce939cdb9cc6e9ecceb6a05 (patch) | |
tree | cf1cf7ecbff088465b5aa0c765857dc9e220e57f | |
parent | 24deb52564fa04b502405dbe4b4fb152165f9608 (diff) |
Android: skip tests that require running test helpers with QProcess
QProcess does not support executing custom bundled binaries from the
apk, so such tests will fail, so they need to be skipped.
Task-number: QTBUG-100449
Change-Id: I54b2374db25154074ce75364a7359a637ddcae98
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
(cherry picked from commit 3144315fe7cf08620f3ac95aedffffcf9ed28499)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
7 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/external_IODevice/tst_client/tst_client.cpp b/tests/auto/external_IODevice/tst_client/tst_client.cpp index 56fd1d3..f10d0c3 100644 --- a/tests/auto/external_IODevice/tst_client/tst_client.cpp +++ b/tests/auto/external_IODevice/tst_client/tst_client.cpp @@ -46,6 +46,10 @@ private slots: } void testRun() { +// TODO: This a limitation of QProcess on Android, QTBUG-88507 is relevant to this issue. +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QProcess serverProc; serverProc.setProcessChannelMode(QProcess::ForwardedChannels); serverProc.start(TestUtils::findExecutable("sslTestServer", "/sslTestServer"), diff --git a/tests/auto/integration_external/external/tst_integration_external.cpp b/tests/auto/integration_external/external/tst_integration_external.cpp index 348da5e..dbc81f6 100644 --- a/tests/auto/integration_external/external/tst_integration_external.cpp +++ b/tests/auto/integration_external/external/tst_integration_external.cpp @@ -58,6 +58,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QFETCH(bool, templated); qDebug() << "Starting server process"; diff --git a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp index cee22b6..df5b173 100644 --- a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp +++ b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp @@ -58,6 +58,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QFETCH(bool, templated); qDebug() << "Starting server process"; diff --git a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp index 73cff14..7c6db69 100644 --- a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp +++ b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp @@ -64,6 +64,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QFETCH(bool, templated); QFETCH(ObjectMode, objectMode); diff --git a/tests/auto/reconnect/tst/tst_reconnect.cpp b/tests/auto/reconnect/tst/tst_reconnect.cpp index 73f3e38..4b29e87 100644 --- a/tests/auto/reconnect/tst/tst_reconnect.cpp +++ b/tests/auto/reconnect/tst/tst_reconnect.cpp @@ -46,6 +46,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QFETCH(QString, url); QVERIFY(TestUtils::init("tst")); diff --git a/tests/auto/repc/signature/signatureTests/tst_signature.cpp b/tests/auto/repc/signature/signatureTests/tst_signature.cpp index ee1e9fb..f561b98 100644 --- a/tests/auto/repc/signature/signatureTests/tst_signature.cpp +++ b/tests/auto/repc/signature/signatureTests/tst_signature.cpp @@ -52,6 +52,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif qDebug() << "Starting signatureServer process"; QProcess serverProc; serverProc.setProcessChannelMode(QProcess::ForwardedChannels); diff --git a/tests/auto/restart/tst/tst_restart.cpp b/tests/auto/restart/tst/tst_restart.cpp index 2222cb6..b4024c9 100644 --- a/tests/auto/restart/tst/tst_restart.cpp +++ b/tests/auto/restart/tst/tst_restart.cpp @@ -72,6 +72,9 @@ private slots: void testRun() { +#ifdef Q_OS_ANDROID + QSKIP("QProcess doesn't support running user bundled binaries on Android"); +#endif QFETCH(RunMode, runMode); QFETCH(ObjectMode, objectMode); |