summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/global
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/global')
-rw-r--r--tests/auto/corelib/global/qlogging/test/test.pro6
-rw-r--r--tests/auto/corelib/global/qlogging/tst_qlogging.cpp14
2 files changed, 17 insertions, 3 deletions
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 8dafc4509c..91896d4494 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -4,14 +4,14 @@ qtConfig(c++14): CONFIG += c++14
debug_and_release {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../debug/helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
} else {
TARGET = ../../release/tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../release/helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
}
} else {
TARGET = ../tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../helper
}
QT = core testlib
diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 863582f498..d3ed1a6d0d 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -813,12 +813,19 @@ void tst_qmessagehandler::qMessagePattern()
#if !QT_CONFIG(process)
QSKIP("This test requires QProcess support");
#else
+#ifdef Q_OS_ANDROID
+ QSKIP("This test crashes on Android");
+#endif
QFETCH(QString, pattern);
QFETCH(bool, valid);
QFETCH(QList<QByteArray>, expected);
QProcess process;
+#ifndef Q_OS_ANDROID
const QString appExe(QLatin1String("helper"));
+#else
+ const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so"));
+#endif
//
// test QT_MESSAGE_PATTERN
@@ -855,13 +862,20 @@ void tst_qmessagehandler::setMessagePattern()
#if !QT_CONFIG(process)
QSKIP("This test requires QProcess support");
#else
+#ifdef Q_OS_ANDROID
+ QSKIP("This test crashes on Android");
+#endif
//
// test qSetMessagePattern
//
QProcess process;
+#ifndef Q_OS_ANDROID
const QString appExe(QLatin1String("helper"));
+#else
+ const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so"));
+#endif
// make sure there is no QT_MESSAGE_PATTERN in the environment
QStringList environment = m_baseEnvironment;