1
0
mirror of https://github.com/systemd/systemd.git synced 2025-02-23 13:57:33 +03:00

test-mount-util: add output test for mount_flags_to_string()

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-06-21 19:21:10 +02:00 committed by Yu Watanabe
parent 917578880f
commit 51bb6a103e
3 changed files with 52 additions and 1 deletions

View File

@ -531,7 +531,7 @@ int mode_to_inaccessible_node(
return 0; return 0;
} }
static int mount_flags_to_string(long unsigned flags, char **ret) { int mount_flags_to_string(long unsigned flags, char **ret) {
static const struct { static const struct {
long unsigned flag; long unsigned flag;
const char *name; const char *name;

View File

@ -89,6 +89,7 @@ int mount_option_mangle(
char **ret_remaining_options); char **ret_remaining_options);
int mode_to_inaccessible_node(const char *runtime_dir, mode_t mode, char **dest); int mode_to_inaccessible_node(const char *runtime_dir, mode_t mode, char **dest);
int mount_flags_to_string(long unsigned flags, char **ret);
/* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */ /* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */
static inline char* umount_and_rmdir_and_free(char *p) { static inline char* umount_and_rmdir_and_free(char *p) {

View File

@ -7,6 +7,7 @@
#include "capability-util.h" #include "capability-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "fileio.h" #include "fileio.h"
#include "missing_mount.h"
#include "mount-util.h" #include "mount-util.h"
#include "namespace-util.h" #include "namespace-util.h"
#include "path-util.h" #include "path-util.h"
@ -78,6 +79,54 @@ static void test_mount_option_mangle(void) {
opts = mfree(opts); opts = mfree(opts);
} }
static void test_mount_flags_to_string_one(unsigned long flags, const char *expected) {
_cleanup_free_ char *x = NULL;
int r;
r = mount_flags_to_string(flags, &x);
log_info("flags: %#lX → %d/\"%s\"", flags, r, strnull(x));
assert_se(r >= 0);
assert_se(streq(x, expected));
}
static void test_mount_flags_to_string(void) {
log_info("/* %s */", __func__);
test_mount_flags_to_string_one(0, "0");
test_mount_flags_to_string_one(MS_RDONLY, "MS_RDONLY");
test_mount_flags_to_string_one(MS_NOSUID, "MS_NOSUID");
test_mount_flags_to_string_one(MS_NODEV, "MS_NODEV");
test_mount_flags_to_string_one(MS_NOEXEC, "MS_NOEXEC");
test_mount_flags_to_string_one(MS_SYNCHRONOUS, "MS_SYNCHRONOUS");
test_mount_flags_to_string_one(MS_REMOUNT, "MS_REMOUNT");
test_mount_flags_to_string_one(MS_MANDLOCK, "MS_MANDLOCK");
test_mount_flags_to_string_one(MS_DIRSYNC, "MS_DIRSYNC");
test_mount_flags_to_string_one(MS_NOSYMFOLLOW, "MS_NOSYMFOLLOW");
test_mount_flags_to_string_one(MS_NOATIME, "MS_NOATIME");
test_mount_flags_to_string_one(MS_NODIRATIME, "MS_NODIRATIME");
test_mount_flags_to_string_one(MS_BIND, "MS_BIND");
test_mount_flags_to_string_one(MS_MOVE, "MS_MOVE");
test_mount_flags_to_string_one(MS_REC, "MS_REC");
test_mount_flags_to_string_one(MS_SILENT, "MS_SILENT");
test_mount_flags_to_string_one(MS_POSIXACL, "MS_POSIXACL");
test_mount_flags_to_string_one(MS_UNBINDABLE, "MS_UNBINDABLE");
test_mount_flags_to_string_one(MS_PRIVATE, "MS_PRIVATE");
test_mount_flags_to_string_one(MS_SLAVE, "MS_SLAVE");
test_mount_flags_to_string_one(MS_SHARED, "MS_SHARED");
test_mount_flags_to_string_one(MS_RELATIME, "MS_RELATIME");
test_mount_flags_to_string_one(MS_KERNMOUNT, "MS_KERNMOUNT");
test_mount_flags_to_string_one(MS_I_VERSION, "MS_I_VERSION");
test_mount_flags_to_string_one(MS_STRICTATIME, "MS_STRICTATIME");
test_mount_flags_to_string_one(MS_LAZYTIME, "MS_LAZYTIME");
test_mount_flags_to_string_one(MS_LAZYTIME|MS_STRICTATIME, "MS_STRICTATIME|MS_LAZYTIME");
test_mount_flags_to_string_one(UINT_MAX,
"MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|MS_SYNCHRONOUS|MS_REMOUNT|"
"MS_MANDLOCK|MS_DIRSYNC|MS_NOSYMFOLLOW|MS_NOATIME|MS_NODIRATIME|"
"MS_BIND|MS_MOVE|MS_REC|MS_SILENT|MS_POSIXACL|MS_UNBINDABLE|"
"MS_PRIVATE|MS_SLAVE|MS_SHARED|MS_RELATIME|MS_KERNMOUNT|"
"MS_I_VERSION|MS_STRICTATIME|MS_LAZYTIME|fc000200");
}
static void test_bind_remount_recursive(void) { static void test_bind_remount_recursive(void) {
_cleanup_(rm_rf_physical_and_freep) char *tmp = NULL; _cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
_cleanup_free_ char *subdir = NULL; _cleanup_free_ char *subdir = NULL;
@ -172,6 +221,7 @@ int main(int argc, char *argv[]) {
test_setup_logging(LOG_DEBUG); test_setup_logging(LOG_DEBUG);
test_mount_option_mangle(); test_mount_option_mangle();
test_mount_flags_to_string();
test_bind_remount_recursive(); test_bind_remount_recursive();
test_bind_remount_one(); test_bind_remount_one();