diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2017-02-17 11:38:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 11:38:23 +0300 |
| commit | f73e6ee687213d8f78a93a9519901d0fe314c228 (patch) | |
| tree | 30e41a1b946ad8391f806be4cb85250b97732715 /src/test/test-cgroup-mask.c | |
| parent | 5c1be4f73082d09011661516c39fb53626d8bdc7 (diff) | |
| parent | e53bcabb4b885ec998cc693e0788c3d68617bef2 (diff) | |
Merge pull request #5338 from mbiebl/fix-install-tests-target
Fix "make install-tests" when srcdir != builddir, fix valgrind-tests
Diffstat (limited to 'src/test/test-cgroup-mask.c')
| -rw-r--r-- | src/test/test-cgroup-mask.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 630587aaf1..b42088c680 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -27,6 +27,7 @@ #include "unit.h" static int test_cgroup_mask(void) { + _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; Manager *m = NULL; Unit *son, *daughter, *parent, *root, *grandchild, *parent_deep; FILE *serial = NULL; @@ -34,7 +35,8 @@ static int test_cgroup_mask(void) { int r; /* Prepare the manager. */ - assert_se(set_unit_path(TEST_DATA_DIR("")) >= 0); + assert_se(set_unit_path(get_testdata_dir("")) >= 0); + assert_se(runtime_dir = setup_fake_runtime_dir()); r = manager_new(UNIT_FILE_USER, true, &m); if (r == -EPERM || r == -EACCES) { puts("manager_new: Permission denied. Skipping test."); @@ -110,10 +112,8 @@ static int test_cgroup_mask(void) { } int main(int argc, char* argv[]) { - _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL; int rc = 0; - assert_se(runtime_dir = setup_fake_runtime_dir()); TEST_REQ_RUNNING_SYSTEMD(rc = test_cgroup_mask()); return rc; |