diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-29 09:54:13 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 03:04:29 +0200 |
| commit | 61904b8cfc68f3668ec9beed6e0746cf16d1a5f6 (patch) | |
| tree | efd63c3503c783f037d43d043a914532e83c6242 /tests/auto/widgets/dialogs | |
| parent | c68f4367f6bc379aeb27e63bf5ba67f34ddb5192 (diff) | |
Make tst_qfilesystemmodel parallel-safe.
Changed one testfunction to use the test's own QTemporaryDir instead of
the system-wide temporary directory.
Change-Id: I6740a7f4ba7f53174cd0730239d8dc088e5111ba
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto/widgets/dialogs')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro | 1 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro index 166306757c..076025e325 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro @@ -1,4 +1,5 @@ CONFIG += testcase +CONFIG += parallel_test QT += widgets widgets-private QT += core-private gui testlib diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 47c40032c3..af213a5508 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -889,7 +889,7 @@ void tst_QFileSystemModel::sort() void tst_QFileSystemModel::mkdir() { - QString tmp = QDir::tempPath(); + QString tmp = flatDirTestPath; QString newFolderPath = QDir::toNativeSeparators(tmp + '/' + "NewFoldermkdirtest4"); QModelIndex tmpDir = model->index(tmp); QVERIFY(tmpDir.isValid()); |