diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-06-26 16:50:50 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2018-06-28 07:12:47 +0000 |
commit | 6ee26c543ef0d74110c296c73384e1461aa017da (patch) | |
tree | 2861bda38567d7547676119de5f1f44a5ca38749 /tests/auto/corelib/plugin/quuid | |
parent | 8a73085a0dc1bdb6d25ac4afcd5429018b55b967 (diff) |
Android: Pass tst_QUuid
Same issue as has been seen a few other places: path to executable being
wrong, and then a crash when the paths are fixed.
Change-Id: I77a596c6e52d2a02a69a6b9dfe91f878b3ffe07c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/plugin/quuid')
-rw-r--r-- | tests/auto/corelib/plugin/quuid/tst_quuid.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp index bad72c081b..16552059dd 100644 --- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp +++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp @@ -94,7 +94,11 @@ void tst_QUuid::initTestCase() #if QT_CONFIG(process) // chdir to the directory containing our testdata, then refer to it with relative paths +#ifdef Q_OS_ANDROID + QString testdata_dir = QCoreApplication::applicationDirPath(); +#else // !Q_OS_ANDROID QString testdata_dir = QFileInfo(QFINDTESTDATA("testProcessUniqueness")).absolutePath(); +#endif QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir)); #endif @@ -401,6 +405,9 @@ void tst_QUuid::processUniqueness() #if !QT_CONFIG(process) QSKIP("No qprocess support", SkipAll); #else +#ifdef Q_OS_ANDROID + QSKIP("This test crashes on Android"); +#endif QProcess process; QString processOneOutput; QString processTwoOutput; @@ -408,6 +415,8 @@ void tst_QUuid::processUniqueness() // Start it once #ifdef Q_OS_MAC process.start("testProcessUniqueness/testProcessUniqueness.app"); +#elif defined(Q_OS_ANDROID) + process.start("libtestProcessUniqueness.so"); #else process.start("testProcessUniqueness/testProcessUniqueness"); #endif @@ -417,6 +426,8 @@ void tst_QUuid::processUniqueness() // Start it twice #ifdef Q_OS_MAC process.start("testProcessUniqueness/testProcessUniqueness.app"); +#elif defined(Q_OS_ANDROID) + process.start("libtestProcessUniqueness.so"); #else process.start("testProcessUniqueness/testProcessUniqueness"); #endif |