test: re-drop assumption that /run is a mount point (#5377)

Commit 436e916ea introduced the assumption into test-stat-util that /run
is a tmpfs mount point. This is not the case in build chroots such as
Fedora's mock or Debian's sbuild. So only assert that /run is a tmpfs
and not a btrfs if /run is actually a mount point. This will then still
be asserted with installed tests.

diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c
index a48dca99e17b2c14c609efe78c5e1a7ee3e3f6c8..28ca6bc3177e88306944b7d57b1df56d66ed4874 100644 (file)
--- a/src/test/test-stat-util.c
+++ b/src/test/test-stat-util.c
@@ -26,6 +26,7 @@
 #include "fileio.h"
 #include "macro.h"
 #include "missing.h"
+#include "mount-util.h"
 #include "stat-util.h"
 
 static void test_files_same(void) {
@@ -69,8 +70,11 @@ static void test_path_is_os_tree(void) {
 }
 
 static void test_path_check_fstype(void) {
-        assert_se(path_check_fstype("/run", TMPFS_MAGIC) > 0);
-        assert_se(path_check_fstype("/run", BTRFS_SUPER_MAGIC) == 0);
+        /* run might not be a mount point in build chroots */
+        if (path_is_mount_point("/run", NULL, AT_SYMLINK_FOLLOW) > 0) {
+                assert_se(path_check_fstype("/run", TMPFS_MAGIC) > 0);
+                assert_se(path_check_fstype("/run", BTRFS_SUPER_MAGIC) == 0);
+        }
         assert_se(path_check_fstype("/proc", PROC_SUPER_MAGIC) > 0);
         assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0);
         assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0);