chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: add new .slice unit type for partitioning systems
[elogind.git]
/
src
/
test
/
test-unit-name.c
diff --git
a/src/test/test-unit-name.c
b/src/test/test-unit-name.c
index 0b6b56394ee6abba0b63cec7b0e4096cd5cde347..86cb2b8da64c42ecd75a9b1bf41ce1fa0c288a2c 100644
(file)
--- a/
src/test/test-unit-name.c
+++ b/
src/test/test-unit-name.c
@@
-38,7
+38,7
@@
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
@@
-57,7
+57,7
@@
static void test_replacements(void) {
#undef expect
#define expect(path, suffix, expected) \
{ \
#undef expect
#define expect(path, suffix, expected) \
{ \
-
char _cleanup_free_
*k, *t = \
+
_cleanup_free_ char
*k, *t = \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
@@
-75,7
+75,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
@@
-90,7
+90,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern) \
{ \
#undef expect
#define expect(pattern) \
{ \
-
char _cleanup_free_
*k, *t; \
+
_cleanup_free_ char
*k, *t; \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
@@
-108,12
+108,12
@@
static void test_replacements(void) {
#undef expect
}
#undef expect
}
-static
void
test_unit_printf(void) {
+static
int
test_unit_printf(void) {
Manager *m;
Unit *u, *u2;
int r;
Manager *m;
Unit *u, *u2;
int r;
-
char _cleanup_free_
*mid, *bid, *host, *root_uid;
+
_cleanup_free_ char
*mid, *bid, *host, *root_uid;
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
@@
-126,14
+126,14
@@
static void test_unit_printf(void) {
r = manager_new(SYSTEMD_USER, &m);
if (r == -EPERM) {
puts("manager_new: Permission denied. Skipping test.");
r = manager_new(SYSTEMD_USER, &m);
if (r == -EPERM) {
puts("manager_new: Permission denied. Skipping test.");
- return;
+ return
EXIT_TEST_SKIP
;
}
assert(r == 0);
#define expect(unit, pattern, expected) \
{ \
char *e; \
}
assert(r == 0);
#define expect(unit, pattern, expected) \
{ \
char *e; \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_full_printf(unit, pattern); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
unit_full_printf(unit, pattern); \
printf("result: %s\nexpect: %s\n", t, expected); \
if ((e = endswith(expected, "*"))) \
@@
-189,11
+189,11
@@
static void test_unit_printf(void) {
expect(u2, "%b", bid);
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
expect(u2, "%b", bid);
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
+
+ return 0;
}
int main(int argc, char* argv[]) {
test_replacements();
}
int main(int argc, char* argv[]) {
test_replacements();
- test_unit_printf();
-
- return 0;
+ return test_unit_printf();
}
}