X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test-engine.c;h=27e16f34848d54c476ef27d47448d41742be73e4;hp=c14a3402dd00fdbb5ef190c35d15b2eefaca8662;hb=d9a76d8f860c4ee19c4aa0df685889d058f4c5cb;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662

diff --git a/test-engine.c b/test-engine.c
index c14a3402d..27e16f348 100644
--- a/test-engine.c
+++ b/test-engine.c
@@ -1,5 +1,24 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -12,14 +31,14 @@ int main(int argc, char *argv[]) {
         Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL, *h = NULL;
         Job *j;
 
-        assert_se(chdir("test2") == 0);
+        assert_se(set_unit_path("test2") >= 0);
 
-        assert_se(m = manager_new());
+        assert_se(manager_new(MANAGER_INIT, false, &m) >= 0);
 
         printf("Load1:\n");
-        assert_se(manager_load_unit(m, "a.service", &a) == 0);
-        assert_se(manager_load_unit(m, "b.service", &b) == 0);
-        assert_se(manager_load_unit(m, "c.service", &c) == 0);
+        assert_se(manager_load_unit(m, "a.service", NULL, &a) == 0);
+        assert_se(manager_load_unit(m, "b.service", NULL, &b) == 0);
+        assert_se(manager_load_unit(m, "c.service", NULL, &c) == 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test1: (Trivial)\n");
@@ -28,8 +47,8 @@ int main(int argc, char *argv[]) {
 
         printf("Load2:\n");
         manager_clear_jobs(m);
-        assert_se(manager_load_unit(m, "d.service", &d) == 0);
-        assert_se(manager_load_unit(m, "e.service", &e) == 0);
+        assert_se(manager_load_unit(m, "d.service", NULL, &d) == 0);
+        assert_se(manager_load_unit(m, "e.service", NULL, &e) == 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test2: (Cyclic Order, Unfixable)\n");
@@ -45,7 +64,7 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load3:\n");
-        assert_se(manager_load_unit(m, "g.service", &g) == 0);
+        assert_se(manager_load_unit(m, "g.service", NULL, &g) == 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test5: (Colliding transaction, fail)\n");
@@ -67,7 +86,7 @@ int main(int argc, char *argv[]) {
         manager_dump_jobs(m, stdout, "\t");
 
         printf("Load4:\n");
-        assert_se(manager_load_unit(m, "h.service", &h) == 0);
+        assert_se(manager_load_unit(m, "h.service", NULL, &h) == 0);
         manager_dump_units(m, stdout, "\t");
 
         printf("Test10: (Unmeargable job type of auxiliary job, fail)\n");