From 6fbb02add54d4903c9f4092e978ec58a844dcd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 24 Nov 2021 15:43:01 +0200 Subject: [PATCH] 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 --- .../io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 6 +++--- 1 file 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 8b61025cc0d..eda146dd020 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());