SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Martin Pitt
2017-02-17 15:29:02 -05:00
committed by Zbigniew Jędrzejewski-Szmek
parent ef6e596ff0
commit cc39016131
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-stat-util.c
+6 -2
View File
@@ -26,6 +26,7 @@
#include "fileio.h" #include "fileio.h"
#include "macro.h" #include "macro.h"
#include "missing.h" #include "missing.h"
#include "mount-util.h"
#include "stat-util.h" #include "stat-util.h"
static void test_files_same(void) { 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) { static void test_path_check_fstype(void) {
assert_se(path_check_fstype("/run", TMPFS_MAGIC) > 0); /* run might not be a mount point in build chroots */
assert_se(path_check_fstype("/run", BTRFS_SUPER_MAGIC) == 0); 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", PROC_SUPER_MAGIC) > 0);
assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0); assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0);
assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0); assert_se(path_check_fstype("/proc", BTRFS_SUPER_MAGIC) == 0);