From 5c6d1324084f506fdb992d48515894a64e8f4841 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Tue, 4 Apr 2017 15:07:30 +0300
Subject: Fix tst_QDirModel for qemu

QTBUG-43818 does not affect only Android, it can be reproduced also
with qemu.

Change-Id: I6364c09b3c7f860b34899e26056ad562b7c338f2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro     | 3 +++
 tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp | 4 ++++
 2 files changed, 7 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
index ea4e9d4620..61939983e6 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
+++ b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
@@ -3,6 +3,9 @@ TARGET = tst_qdirmodel
 QT += widgets testlib
 SOURCES         += tst_qdirmodel.cpp
 
+INCLUDEPATH += ../../../../shared/
+HEADERS += ../../../../shared/emulationdetector.h
+
 wince* {
 	addit.files = dirtest\\test1\\*
 	addit.path = dirtest\\test1
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 30109952c7..2044704e76 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -32,6 +32,7 @@
 #include <qtreeview.h>
 #include <qdir.h>
 #include <qdebug.h>
+#include "emulationdetector.h"
 
 class tst_QDirModel : public QObject
 {
@@ -615,6 +616,9 @@ void tst_QDirModel::task196768_sorting()
 
 #if defined(Q_OS_ANDROID)
     QEXPECT_FAIL("", "QTBUG-43818", Continue);
+#else
+    if (EmulationDetector::isRunningArmOnX86())
+        QEXPECT_FAIL("", "QTBUG-43818", Continue);
 #endif
 
     QCOMPARE(index.data(), index2.data());
-- 
cgit v1.2.3