chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: introduce UID_INVALID (and friends) as macro for (uid_t) -1
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
test-bus-gvariant.c
diff --git
a/src/libsystemd/sd-bus/test-bus-gvariant.c
b/src/libsystemd/sd-bus/test-bus-gvariant.c
index cb07c9627341d31555b0629cb5a2df8e673319ff..56df5d0b48efcf353eb2a21c1006279a485253fb 100644
(file)
--- a/
src/libsystemd/sd-bus/test-bus-gvariant.c
+++ b/
src/libsystemd/sd-bus/test-bus-gvariant.c
@@
-134,11
+134,15
@@
static void test_marshal(void) {
_cleanup_bus_unref_ sd_bus *bus = NULL;
_cleanup_free_ void *blob;
size_t sz;
_cleanup_bus_unref_ sd_bus *bus = NULL;
_cleanup_free_ void *blob;
size_t sz;
+ int r;
+
+ r = sd_bus_open_system(&bus);
+ if (r < 0)
+ exit(EXIT_TEST_SKIP);
- assert_se(sd_bus_open_system(&bus) >= 0);
bus->message_version = 2; /* dirty hack to enable gvariant*/
bus->message_version = 2; /* dirty hack to enable gvariant*/
- assert_se(sd_bus_message_new_method_call(bus,
"a.service.name", "/an/object/path/which/is/really/really/long/so/that/we/hit/the/eight/bit/boundary/by/quite/some/margin/to/test/this/stuff/that/it/really/works", "an.interface.name", "AMethodName", &m
) >= 0);
+ assert_se(sd_bus_message_new_method_call(bus,
&m, "a.service.name", "/an/object/path/which/is/really/really/long/so/that/we/hit/the/eight/bit/boundary/by/quite/some/margin/to/test/this/stuff/that/it/really/works", "an.interface.name", "AMethodName"
) >= 0);
assert_se(sd_bus_message_append(m,
"a(usv)", 3,
assert_se(sd_bus_message_append(m,
"a(usv)", 3,
@@
-171,23
+175,23
@@
static void test_marshal(void) {
}
#endif
}
#endif
- assert_se(bus_message_dump(m, NULL,
true
) >= 0);
+ assert_se(bus_message_dump(m, NULL,
BUS_MESSAGE_DUMP_WITH_HEADER
) >= 0);
assert_se(bus_message_get_blob(m, &blob, &sz) >= 0);
assert_se(bus_message_get_blob(m, &blob, &sz) >= 0);
- assert_se(bus_message_from_malloc(
NULL
, blob, sz, NULL, 0, NULL, NULL, &n) >= 0);
+ assert_se(bus_message_from_malloc(
bus
, blob, sz, NULL, 0, NULL, NULL, &n) >= 0);
blob = NULL;
blob = NULL;
- assert_se(bus_message_dump(n, NULL,
true
) >= 0);
+ assert_se(bus_message_dump(n, NULL,
BUS_MESSAGE_DUMP_WITH_HEADER
) >= 0);
m = sd_bus_message_unref(m);
m = sd_bus_message_unref(m);
- assert_se(sd_bus_message_new_method_call(bus,
"a.x", "/a/x", "a.x", "Ax", &m
) >= 0);
+ assert_se(sd_bus_message_new_method_call(bus,
&m, "a.x", "/a/x", "a.x", "Ax"
) >= 0);
assert_se(sd_bus_message_append(m, "as", 0) >= 0);
assert_se(bus_message_seal(m, 4712, 0) >= 0);
assert_se(sd_bus_message_append(m, "as", 0) >= 0);
assert_se(bus_message_seal(m, 4712, 0) >= 0);
- assert_se(bus_message_dump(m, NULL,
true
) >= 0);
+ assert_se(bus_message_dump(m, NULL,
BUS_MESSAGE_DUMP_WITH_HEADER
) >= 0);
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {