Merge pull request #6582 from poettering/logind-tty

various tty path parsing fixes
This commit is contained in:
Yu Watanabe
2017-08-26 22:12:48 +09:00
committed by GitHub
11 changed files with 59 additions and 27 deletions
+16
View File
@@ -588,6 +588,21 @@ static void test_systemd_installation_has_version(const char *path) {
}
}
static void test_skip_dev_prefix(void) {
assert_se(streq(skip_dev_prefix("/"), "/"));
assert_se(streq(skip_dev_prefix("/dev"), ""));
assert_se(streq(skip_dev_prefix("/dev/"), ""));
assert_se(streq(skip_dev_prefix("/dev/foo"), "foo"));
assert_se(streq(skip_dev_prefix("/dev/foo/bar"), "foo/bar"));
assert_se(streq(skip_dev_prefix("//dev"), ""));
assert_se(streq(skip_dev_prefix("//dev//"), ""));
assert_se(streq(skip_dev_prefix("/dev///foo"), "foo"));
assert_se(streq(skip_dev_prefix("///dev///foo///bar"), "foo///bar"));
assert_se(streq(skip_dev_prefix("//foo"), "//foo"));
assert_se(streq(skip_dev_prefix("foo"), "foo"));
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
@@ -607,6 +622,7 @@ int main(int argc, char **argv) {
test_file_in_same_dir();
test_filename_is_valid();
test_hidden_or_backup_file();
test_skip_dev_prefix();
test_systemd_installation_has_version(argv[1]); /* NULL is OK */