[systemd-commits] .gitignore Makefile.am src/libsystemd-bus

[Lennart Poettering]

 .gitignore                           |    1 
 Makefile.am                          |   14 ++++++
 src/libsystemd-bus/bus-message.h     |    1 
 src/libsystemd-bus/test-bus-kernel.c |   71 +++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 1 deletion(-)

New commits:
commit dd418b9a69cdfc7c186d86d03b34d83577b0c319
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 12 00:26:12 2013 +0200

    bus: add kdbus test case

diff --git a/.gitignore b/.gitignore
index 8ca7ae8..c1fe85d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,6 +82,7 @@
 /systemd-vconsole-setup
 /tags
 /test-bus-chat
+/test-bus-kernel
 /test-bus-marshal
 /test-bus-match
 /test-bus-signature
diff --git a/Makefile.am b/Makefile.am
index ae58c16..117bbf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1724,7 +1724,8 @@ noinst_tests += \
 	test-bus-signature \
 	test-bus-chat \
 	test-bus-server \
-	test-bus-match
+	test-bus-match \
+	test-bus-kernel
 
 noinst_PROGRAMS += \
 	busctl
@@ -1785,6 +1786,17 @@ test_bus_match_LDADD = \
 	libsystemd-bus.la \
 	libsystemd-id128-internal.la
 
+test_bus_kernel_SOURCES = \
+	src/libsystemd-bus/test-bus-kernel.c
+
+test_bus_kernel_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_bus_kernel_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-id128-internal.la
+
 busctl_SOURCES = \
 	src/libsystemd-bus/busctl.c
 
diff --git a/src/libsystemd-bus/bus-message.h b/src/libsystemd-bus/bus-message.h
index 3d1bb62..d1ab548 100644
--- a/src/libsystemd-bus/bus-message.h
+++ b/src/libsystemd-bus/bus-message.h
@@ -28,6 +28,7 @@
 #include "macro.h"
 #include "sd-bus.h"
 #include "kdbus.h"
+#include "time-util.h"
 
 struct bus_container {
         char enclosing;
diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
new file mode 100644
index 0000000..143b9d5
--- /dev/null
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -0,0 +1,71 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2013 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "util.h"
+
+#include "sd-bus.h"
+#include "bus-message.h"
+#include "bus-error.h"
+#include "bus-kernel.h"
+
+int main(int argc, char *argv[]) {
+        _cleanup_close_ int bus_ref = -1;
+        _cleanup_free_ char *bus_name = NULL, *address = NULL;
+        const char *ua = NULL, *ub = NULL;
+        sd_bus *a, *b;
+        int r;
+
+        bus_ref = bus_kernel_create("deine-mutter", &bus_name);
+        assert_se(bus_ref >= 0);
+
+        address = strappend("kernel:", bus_name);
+        assert_se(address);
+
+        r = sd_bus_new(&a);
+        assert_se(r >= 0);
+
+        r = sd_bus_new(&b);
+        assert_se(r >= 0);
+
+        r = sd_bus_set_address(a, address);
+        assert_se(r >= 0);
+
+        r = sd_bus_set_address(b, address);
+        assert_se(r >= 0);
+
+        r = sd_bus_start(a);
+        assert_se(r >= 0);
+
+        r = sd_bus_start(b);
+        assert_se(r >= 0);
+
+        r = sd_bus_get_unique_name(a, &ua);
+        assert_se(r >= 0);
+
+        printf("unique a: %s", ua);
+
+        r = sd_bus_get_unique_name(b, &ub);
+        assert_se(r >= 0);
+
+        printf("unique b: %s", ub);
+
+        return 0;
+}