X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-log.c;h=626d2c6135b1d23efedaab57816f38211ec73da8;hb=b0118a799cb47c331d976d9d43ce0c5130b13cdc;hp=8dc3d5383f387bf976e4ee3804c56ce8b983b66b;hpb=963ddb917de3140308ee62fb642b2307a577a39e;p=elogind.git

diff --git a/src/test/test-log.c b/src/test/test-log.c
index 8dc3d5383..626d2c613 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -22,7 +20,18 @@
 #include <stddef.h>
 #include <unistd.h>
 
+#include "format-util.h"
 #include "log.h"
+#include "util.h"
+
+assert_cc(LOG_REALM_REMOVE_LEVEL(LOG_REALM_PLUS_LEVEL(LOG_REALM_SYSTEMD, LOG_FTP | LOG_DEBUG))
+          == LOG_REALM_SYSTEMD);
+assert_cc(LOG_REALM_REMOVE_LEVEL(LOG_REALM_PLUS_LEVEL(LOG_REALM_UDEV, LOG_LOCAL7 | LOG_DEBUG))
+          == LOG_REALM_UDEV);
+assert_cc((LOG_REALM_PLUS_LEVEL(LOG_REALM_SYSTEMD, LOG_LOCAL3 | LOG_DEBUG) & LOG_FACMASK)
+          == LOG_LOCAL3);
+assert_cc((LOG_REALM_PLUS_LEVEL(LOG_REALM_UDEV, LOG_USER | LOG_INFO) & LOG_PRIMASK)
+          == LOG_INFO);
 
 int main(int argc, char* argv[]) {
 
@@ -30,7 +39,7 @@ int main(int argc, char* argv[]) {
         log_open();
 
         log_struct(LOG_INFO,
-                   "MESSAGE=Waldo PID=%lu", (unsigned long) getpid(),
+                   "MESSAGE=Waldo PID="PID_FMT, getpid(),
                    "SERVICE=piepapo",
                    NULL);
 
@@ -38,12 +47,12 @@ int main(int argc, char* argv[]) {
         log_open();
 
         log_struct(LOG_INFO,
-                   "MESSAGE=Foobar PID=%lu", (unsigned long) getpid(),
+                   "MESSAGE=Foobar PID="PID_FMT, getpid(),
                    "SERVICE=foobar",
                    NULL);
 
         log_struct(LOG_INFO,
-                   "MESSAGE=Foobar PID=%lu", (unsigned long) getpid(),
+                   "MESSAGE=Foobar PID="PID_FMT, getpid(),
                    "FORMAT_STR_TEST=1=%i A=%c 2=%hi 3=%li 4=%lli 1=%p foo=%s 2.5=%g 3.5=%g 4.5=%Lg",
                    (int) 1, 'A', (short) 2, (long int) 3, (long long int) 4, (void*) 1, "foo", (float) 2.5f, (double) 3.5, (long double) 4.5,
                    "SUFFIX=GOT IT",