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

test-specifier: replace /dev/initctl with /dev/fd

Browse Source 
To make the test work even when systemd is built without SysV compat.
This commit is contained in:
Yu Watanabe
2025-04-22 10:24:42 +09:00
parent 33f90ddefd
commit b4d5115264
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-specifier.c
+12 -10
View File
@@ -89,25 +89,27 @@ TEST(specifier_printf) {
TEST(specifier_real_path) {
static const Specifier table[] = {
{ 'p', specifier_string, "/dev/initctl" },
{ 'y', specifier_real_path, "/dev/initctl" },
{ 'Y', specifier_real_directory, "/dev/initctl" },
{ 'p', specifier_string, "/dev/fd" },
{ 'y', specifier_real_path, "/dev/fd" },
{ 'Y', specifier_real_directory, "/dev/fd" },
{ 'w', specifier_real_path, "/dev/tty" },
{ 'W', specifier_real_directory, "/dev/tty" },
{}
};
_cleanup_free_ char *w = NULL;
_cleanup_free_ char *w = NULL, *expected = NULL;
int r;
r = specifier_printf("p=%p y=%y Y=%Y w=%w W=%W", SIZE_MAX, table, NULL, NULL, &w);
assert_se(r >= 0 || r == -ENOENT);
assert_se(w || r == -ENOENT);
puts(strnull(w));
if (r < 0) {
ASSERT_ERROR(r, ENOENT);
return (void) log_tests_skipped_errno(r, "/dev/fd and/or /dev/tty do not exist");
}
/* /dev/initctl should normally be a symlink to /run/initctl */
if (inode_same("/dev/initctl", "/run/initctl", 0) > 0)
ASSERT_STREQ(w, "p=/dev/initctl y=/run/initctl Y=/run w=/dev/tty W=/dev");
ASSERT_OK(asprintf(&expected,
"p=/dev/fd y=/proc/"PID_FMT"/fd Y=/proc/"PID_FMT" w=/dev/tty W=/dev",
getpid_cached(), getpid_cached()));
ASSERT_STREQ(w, expected);
}
TEST(specifier_real_path_missing_file) {