chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume that /proc/meminfo can be missing
[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 93bf28aacee98acc9fae250e0e7a25ce63dfa13d..c17692b845e5af80f469954acaf0baaec39b4ed5 100644
(file)
--- a/
src/test/test-unit-name.c
+++ b/
src/test/test-unit-name.c
@@
-34,6
+34,7
@@
#include "specifier.h"
#include "util.h"
#include "macro.h"
#include "specifier.h"
#include "util.h"
#include "macro.h"
+#include "test-helper.h"
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
@@
-124,7
+125,7
@@
static int test_unit_printf(void) {
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
r = manager_new(SYSTEMD_USER, false, &m);
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
r = manager_new(SYSTEMD_USER, false, &m);
- if (r == -EPERM) {
+ if (r == -EPERM
|| r == -EACCES
) {
puts("manager_new: Permission denied. Skipping test.");
return EXIT_TEST_SKIP;
}
puts("manager_new: Permission denied. Skipping test.");
return EXIT_TEST_SKIP;
}
@@
-190,10
+191,14
@@
static int test_unit_printf(void) {
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
expect(u2, "%H", host);
expect(u2, "%t", "/run/user/*");
+ manager_free(m);
+
return 0;
}
int main(int argc, char* argv[]) {
return 0;
}
int main(int argc, char* argv[]) {
+ int rc = 0;
test_replacements();
test_replacements();
- return test_unit_printf();
+ TEST_REQ_RUNNING_SYSTEMD(rc = test_unit_printf());
+ return rc;
}
}