From 6501c04250eb20593a98401177bdaf513a516919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Thu, 28 Jun 2018 12:31:44 +0200
Subject: Android: Pass tst_QFactoryLoader

Similar to the changes made for tst_QLibrary:
0ac09c40f28987169786b3063af423e9fe93c6b8
but even less intrusive.

Change-Id: I4bc0ba385e639f07f9b39cf8ba9542c27be8a3ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/plugin/qfactoryloader/test/test.pro        |  8 ++++++++
 .../auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp | 11 +++++++++++
 2 files changed, 19 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro
index 9338f4ecc9..5e4d65a49f 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro
+++ b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro
@@ -20,3 +20,11 @@ win32 {
 !qtConfig(library) {
     LIBS += -L ../bin/ -lplugin1 -lplugin2
 }
+
+android {
+    libs.prefix = android_test_data
+    libs.base = $$OUT_PWD/..
+    libs.files += $$OUT_PWD/../bin
+
+    RESOURCES += libs
+}
diff --git a/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp b/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
index 34dc103672..9fa61804b3 100644
--- a/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
+++ b/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp
@@ -42,6 +42,11 @@ Q_IMPORT_PLUGIN(Plugin2)
 class tst_QFactoryLoader : public QObject
 {
     Q_OBJECT
+
+#ifdef Q_OS_ANDROID
+    QSharedPointer<QTemporaryDir> directory;
+#endif
+
 public slots:
     void initTestCase();
 
@@ -53,6 +58,12 @@ static const char binFolderC[] = "bin";
 
 void tst_QFactoryLoader::initTestCase()
 {
+#ifdef Q_OS_ANDROID
+    directory = QEXTRACTTESTDATA("android_test_data");
+    QVERIFY(directory);
+    QVERIFY(directory->isValid());
+    QVERIFY2(QDir::setCurrent(directory->path()), qPrintable("Could not chdir to " + directory->path()));
+#endif
     const QString binFolder = QFINDTESTDATA(binFolderC);
     QVERIFY2(!binFolder.isEmpty(), "Unable to locate 'bin' folder");
 #if QT_CONFIG(library)
-- 
cgit v1.2.3