summaryrefslogtreecommitdiffstats
path: root/src/test/test-cgroup-mask.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-01-07 14:41:24 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-21 01:48:16 +0200
commit0d8c31ff7237149b505290652864b4e7e866b2a7 (patch)
tree2a1497d3b0384fb7ab20c6010276be0e166619eb /src/test/test-cgroup-mask.c
parentAdd quotes to warning message (diff)
downloadsystemd-0d8c31ff7237149b505290652864b4e7e866b2a7.tar.xz
systemd-0d8c31ff7237149b505290652864b4e7e866b2a7.zip
test-engine: fix access to unit load path
Also add a bit of debugging output to help diagnose problems, add missing units, and simplify cppflags. Move test-engine to normal tests from manual tests, it should now work without destroying the system.
Diffstat (limited to 'src/test/test-cgroup-mask.c')
-rw-r--r--src/test/test-cgroup-mask.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 4d60859513..a230c97779 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -37,11 +37,10 @@ static int test_cgroup_mask(void) {
FILE *serial = NULL;
FDSet *fdset = NULL;
int r;
- const char *dir = TEST_DIR;
/* Prepare the manager. */
- assert_se(set_unit_path(dir) >= 0);
- r = manager_new(SYSTEMD_USER, &m);
+ assert_se(set_unit_path(TEST_DIR) >= 0);
+ r = manager_new(SYSTEMD_USER, true, &m);
if (r == -EPERM || r == -EACCES) {
puts("manager_new: Permission denied. Skipping test.");
return EXIT_TEST_SKIP;