chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: when the first char a server receives isn't the NUL byte immediately fail
[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..aba36e4df1ad072e75e200757d396d051decfa9f 100644
(file)
--- a/
src/test/test-unit-name.c
+++ b/
src/test/test-unit-name.c
@@
-108,7
+108,7
@@
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;
@@
-126,7
+126,7
@@
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);
}
assert(r == 0);
@@
-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();
}
}