diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-11-24 15:43:01 +0200 |
|---|---|---|
| committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2021-12-12 11:12:31 +0000 |
| commit | 6fbb02add54d4903c9f4092e978ec58a844dcd89 (patch) | |
| tree | a6115974c95da2ff1555fef39f592331d333c38b /tests/auto/corelib/io | |
| parent | d214c5a09afa48b4498b40eb5594658c8e257e8d (diff) | |
QNX: inotify is supported, so enable tests
Also change usage of QDir::currentPath to QDir::tempPath
instead as QNX tests are run on CI at qemu over NFS.
Pick-to: 6.2
Change-Id: I2e1d6629299acd125117bcce90320c70eeb4a1a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 8b61025cc0..eda146dd02 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -124,7 +124,7 @@ void tst_QFileSystemWatcher::basicTest_data() + QChar(ushort(0x00DC)) // LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS + QStringLiteral(".txt"); -#if !defined(Q_OS_QNX) || !defined(QT_NO_INOTIFY) +#if !defined(QT_NO_INOTIFY) QTest::newRow("native backend-testfile") << "native" << testFile; QTest::newRow("native backend-specialchars") << "native" << specialCharacterFile; #endif @@ -418,7 +418,7 @@ void tst_QFileSystemWatcher::addPaths() { QFileSystemWatcher watcher; QStringList paths; - paths << QDir::homePath() << QDir::currentPath(); + paths << QDir::homePath() << QDir::tempPath(); QCOMPARE(watcher.addPaths(paths), QStringList()); QCOMPARE(watcher.directories().count(), 2); @@ -486,7 +486,7 @@ void tst_QFileSystemWatcher::removePaths() { QFileSystemWatcher watcher; QStringList paths; - paths << QDir::homePath() << QDir::currentPath(); + paths << QDir::homePath() << QDir::tempPath(); QCOMPARE(watcher.addPaths(paths), QStringList()); QCOMPARE(watcher.directories().count(), 2); QCOMPARE(watcher.removePaths(paths), QStringList()); |