diff --git a/autotests/kmountpointtest.h b/autotests/kmountpointtest.h --- a/autotests/kmountpointtest.h +++ b/autotests/kmountpointtest.h @@ -30,6 +30,7 @@ void testPossibleMountPoints(); private: + QString m_rootFSType; }; #endif diff --git a/autotests/kmountpointtest.cpp b/autotests/kmountpointtest.cpp --- a/autotests/kmountpointtest.cpp +++ b/autotests/kmountpointtest.cpp @@ -74,6 +74,7 @@ QVERIFY(rootMountPoint); QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); QVERIFY(!rootMountPoint->probablySlow()); + m_rootFSType = rootMountPoint->mountType(); QT_STATBUF rootStatBuff; QCOMPARE(QT_STAT("/", &rootStatBuff), 0); @@ -123,12 +124,14 @@ QVERIFY(mountWithDevice); #ifdef Q_OS_UNIX - const KMountPoint::Ptr rootMountPoint = mountPoints.findByPath(QStringLiteral("/")); - QVERIFY(rootMountPoint); - QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); - QVERIFY(rootMountPoint->realDeviceName().startsWith(QLatin1String("/"))); // Usually /dev, but can be /host/ubuntu/disks/root.disk... - QVERIFY(!rootMountPoint->mountOptions().contains(QStringLiteral("noauto"))); // how would this work? - QVERIFY(!rootMountPoint->probablySlow()); + if (m_rootFSType != "zfs") { + const KMountPoint::Ptr rootMountPoint = mountPoints.findByPath(QStringLiteral("/")); + QVERIFY(rootMountPoint); + QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/")); + QVERIFY(rootMountPoint->realDeviceName().startsWith(QLatin1String("/"))); // Usually /dev, but can be /host/ubuntu/disks/root.disk... + QVERIFY(!rootMountPoint->mountOptions().contains(QStringLiteral("noauto"))); // how would this work? + QVERIFY(!rootMountPoint->probablySlow()); + } #endif }