chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
test
/
test-conf-files.c
diff --git
a/src/test/test-conf-files.c
b/src/test/test-conf-files.c
index 945ada59a3d376a10fdd7cadc42ad28c0dd2aa7a..894c7f742ffb8d3ffc6d17425b86ba673f6b8d70 100644
(file)
--- a/
src/test/test-conf-files.c
+++ b/
src/test/test-conf-files.c
@@
-36,7
+36,7
@@
static void setup_test_dir(char *tmp_dir, const char *files, ...) {
va_start(ap, files);
while (files != NULL) {
_cleanup_free_ char *path = strappend(tmp_dir, files);
va_start(ap, files);
while (files != NULL) {
_cleanup_free_ char *path = strappend(tmp_dir, files);
- assert_se(touch_file(path, true,
(usec_t) -1
, UID_INVALID, GID_INVALID, 0) == 0);
+ assert_se(touch_file(path, true,
USEC_INFINITY
, UID_INVALID, GID_INVALID, 0) == 0);
files = va_arg(ap, const char *);
}
va_end(ap);
files = va_arg(ap, const char *);
}
va_end(ap);
@@
-59,12
+59,12
@@
static void test_conf_files_list(bool use_root) {
search_2 = "/dir2";
} else {
root_dir = NULL;
search_2 = "/dir2";
} else {
root_dir = NULL;
- search_1 = str
append
a(tmp_dir, "/dir1");
- search_2 = str
append
a(tmp_dir, "/dir2");
+ search_1 = str
join
a(tmp_dir, "/dir1");
+ search_2 = str
join
a(tmp_dir, "/dir2");
}
}
- expect_a = str
append
a(tmp_dir, "/dir1/a.conf");
- expect_b = str
append
a(tmp_dir, "/dir2/b.conf");
+ expect_a = str
join
a(tmp_dir, "/dir1/a.conf");
+ expect_b = str
join
a(tmp_dir, "/dir2/b.conf");
assert_se(conf_files_list(&found_files, ".conf", root_dir, search_1, search_2, NULL) == 0);
strv_print(found_files);
assert_se(conf_files_list(&found_files, ".conf", root_dir, search_1, search_2, NULL) == 0);
strv_print(found_files);