test: hook up more tests with make check

diff --git a/Makefile.am b/Makefile.am
index e688aae3b6ab0da1c74fb1d45555cd52646c69bb..362c4661d38dbc81f218b941b896d79425471049 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -994,7 +994,8 @@ noinst_PROGRAMS += \
 TESTS += \
        test-job-type \
        test-env-replace \
 TESTS += \
        test-job-type \
        test-env-replace \

-       test-strv
+       test-strv \
+       test-unit-name

 
 test_engine_SOURCES = \
        src/test/test-engine.c
 
 test_engine_SOURCES = \
        src/test/test-engine.c


@@ -2333,6 +2334,11 @@ noinst_PROGRAMS += \
        test-journal-match \
        test-journal-stream
 
        test-journal-match \
        test-journal-stream
 

+TESTS += \
+       test-journal
+       test-journal-match \
+       test-journal-stream
+

 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
        src/systemd/sd-messages.h
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
        src/systemd/sd-messages.h

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ed2c308db8aea45f9acd5dfed8b863d02ff676b0..9fb9715a3a75d0d4d802abd047bec0c169fda808 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,3 +2,4 @@ src/hostname/org.freedesktop.hostname1.policy.in
 src/locale/org.freedesktop.locale1.policy.in
 src/login/org.freedesktop.login1.policy.in
 src/timedate/org.freedesktop.timedate1.policy.in
 src/locale/org.freedesktop.locale1.policy.in
 src/login/org.freedesktop.login1.policy.in
 src/timedate/org.freedesktop.timedate1.policy.in

+src/core/org.freedesktop.systemd1.policy.in

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 39f4c167789d3cec08189e064b575b60696a71e4..9e1a4f57baba4cf2e74da66ec8e8db6ff5a693da 100644 (file)
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -34,10 +34,12 @@ int main(int argc, char *argv[]) {
         static const char test[] = "test", test2[] = "test2";
         Object *o;
         uint64_t p;
         static const char test[] = "test", test2[] = "test2";
         Object *o;
         uint64_t p;

+        char t[] = "/tmp/journal-XXXXXX";

 
         log_set_max_level(LOG_DEBUG);
 
 
         log_set_max_level(LOG_DEBUG);
 

-        unlink("test.journal");
+        assert_se(mkdtemp(t));
+        assert_se(chdir(t) >= 0);

 
         assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, NULL, &f) == 0);
 
 
         assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, NULL, &f) == 0);
 


@@ -116,5 +118,7 @@ int main(int argc, char *argv[]) {
 
         log_error("Exiting...");
 
 
         log_error("Exiting...");
 

+        assert_se(rm_rf(t, false, true, false) >= 0);
+

         return 0;
 }
         return 0;
 }