diff options
| author | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-02-17 21:29:02 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-17 15:29:02 -0500 |
| commit | cc39016131a535382ca6bc4c5eb018ff7643ed83 (patch) | |
| tree | 1f22ed884a9791f803b07f4a86b5a45189d5f81d /src/test | |
| parent | ef6e596ff031e58916d00a7800b8482a6d81f105 (diff) | |
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.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-stat-util.c | 8 |
1 files changed, 6 insertions, 2 deletions
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); |