summaryrefslogtreecommitdiff
path: root/user/kio/unmounted-root.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/kio/unmounted-root.patch')
-rw-r--r--user/kio/unmounted-root.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/user/kio/unmounted-root.patch b/user/kio/unmounted-root.patch
new file mode 100644
index 000000000..520703d1f
--- /dev/null
+++ b/user/kio/unmounted-root.patch
@@ -0,0 +1,37 @@
+These tests fail if / (root) is not a mountpoint.
+
+Upstream-URL: https://invent.kde.org/frameworks/kio/-/issues/43
+
+--- kio-5.116.0/autotests/jobtest.cpp.old 2024-05-04 11:40:29.000000000 +0000
++++ kio-5.116.0/autotests/jobtest.cpp 2025-08-10 05:18:18.789195125 +0000
+@@ -60,8 +60,7 @@
+ {
+ KMountPoint::Ptr srcMountPoint = KMountPoint::currentMountPoints().findByPath(homeTmpDir());
+ KMountPoint::Ptr destMountPoint = KMountPoint::currentMountPoints().findByPath(otherTmpDir());
+- Q_ASSERT(srcMountPoint);
+- Q_ASSERT(destMountPoint);
++ if (srcMountPoint == nullptr || destMountPoint == nullptr) return true;
+ return srcMountPoint->mountedFrom() == destMountPoint->mountedFrom();
+ }
+
+--- kio-5.116.0/autotests/kmountpointtest.cpp.old 2024-05-04 11:40:29.000000000 +0000
++++ kio-5.116.0/autotests/kmountpointtest.cpp 2025-08-10 05:26:09.210428498 +0000
+@@ -56,9 +56,15 @@
+ // Check findByPath
+ #ifdef Q_OS_UNIX
+ const KMountPoint::Ptr rootMountPoint = mountPoints.findByPath(QStringLiteral("/"));
+- QVERIFY(rootMountPoint);
+- QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/"));
+- QVERIFY(!rootMountPoint->probablySlow());
++ if (!rootMountPoint) {
++ // This happens on Linux systems running inside chroot jails.
++ QSKIP("Couldn't find a root mountpoint, skipping those tests");
++ return;
++ } else {
++ QVERIFY(rootMountPoint);
++ QCOMPARE(rootMountPoint->mountPoint(), QStringLiteral("/"));
++ QVERIFY(!rootMountPoint->probablySlow());
++ }
+
+ QT_STATBUF rootStatBuff;
+ QCOMPARE(QT_STAT("/", &rootStatBuff), 0);