whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Mårten Nordheim 2018-06-26 16:50:50 +02:00
parent 8a73085a0d
commit 6ee26c543e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/corelib/plugin/quuid/tst_quuid.cpp
View File

@ -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