Remove "insignificant" flag from qfilesystemmodel test

Due to removal of insignificant flag in
tst_qfilesystemmode.pro a bunch of tests will
either fail or crash in different operating systems.

Task-number: QTBUG-70572
Task-number: QTBUG-70573
Task-number: QTBUG-29403
Change-Id: I44925187acd72e600d2fec4f2604b67c66ecdd6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
bb10
Tony Sarajärvi 2018-09-11 14:18:50 +03:00
parent 7227e54445
commit c79b27dbcb
3 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,11 @@
winrt
[sort:QFileDialog usage]
ubuntu
b2qt
[specialFiles]
ubuntu
b2qt
[dirsBeforeFiles]
ubuntu
b2qt
windows

View File

@ -1,3 +1,6 @@
INCLUDEPATH += ../../../../shared
HEADERS += ../../../../shared/emulationdetector.h
CONFIG += testcase
# This testcase can be slow on Windows and OS X, and may interfere with other file system tests.
win32:testcase.timeout = 900
@ -8,5 +11,3 @@ QT += core-private testlib
SOURCES += tst_qfilesystemmodel.cpp
TARGET = tst_qfilesystemmodel
CONFIG += insignificant_test # QTBUG-29403

View File

@ -27,6 +27,7 @@
****************************************************************************/
#include <emulationdetector.h>
#include <QtTest/QtTest>
#ifdef QT_BUILD_INTERNAL
#include <private/qfilesystemmodel_p.h>
@ -788,6 +789,9 @@ void tst_QFileSystemModel::sort()
MyFriendFileSystemModel *myModel = new MyFriendFileSystemModel();
QTreeView *tree = new QTreeView();
if (fileDialogMode && EmulationDetector::isRunningArmOnX86())
QSKIP("Crashes in QEMU. QTBUG-70572");
#ifdef QT_BUILD_INTERNAL
if (fileDialogMode)
myModel->d_func()->disableRecursiveSort = true;