From cc39016131a535382ca6bc4c5eb018ff7643ed83 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 17 Feb 2017 21:29:02 +0100 Subject: 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. --- src/test/test-stat-util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/test/test-stat-util.c') diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index a48dca99e1..28ca6bc317 100644 --- 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); -- cgit v1.2.3-54-g00ecf