From 3f608087bd57c4d9134754cdad562fa057a97c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 30 Sep 2018 19:59:07 +0200 Subject: [PATCH 1/4] libsystemd: export all functions in sd-device.h sd-device.h is now also installed in /usr/include/systemd. --- src/libsystemd/libsystemd.sym | 60 +++++++++++++++++++++++++++++++++++ src/systemd/meson.build | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index b5760989c4..a92b7a21e8 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -576,4 +576,64 @@ global: sd_bus_message_readv; sd_bus_set_method_call_timeout; sd_bus_get_method_call_timeout; + + sd_device_ref; + sd_device_unref; + + sd_device_new_from_syspath; + sd_device_new_from_devnum; + sd_device_new_from_subsystem_sysname; + sd_device_new_from_device_id; + + sd_device_get_parent; + sd_device_get_parent_with_subsystem_devtype; + + sd_device_get_syspath; + sd_device_get_subsystem; + sd_device_get_devtype; + sd_device_get_devnum; + sd_device_get_ifindex; + sd_device_get_driver; + sd_device_get_devpath; + sd_device_get_devname; + sd_device_get_sysname; + sd_device_get_sysnum; + + sd_device_get_is_initialized; + sd_device_get_usec_since_initialized; + + sd_device_get_tag_first; + sd_device_get_tag_next; + sd_device_get_devlink_first; + sd_device_get_devlink_next; + sd_device_get_property_first; + sd_device_get_property_next; + sd_device_get_sysattr_first; + sd_device_get_sysattr_next; + + sd_device_has_tag; + sd_device_get_property_value; + sd_device_get_sysattr_value; + + sd_device_set_sysattr_value; + + sd_device_enumerator_new; + sd_device_enumerator_ref; + sd_device_enumerator_unref; + + sd_device_enumerator_get_device_first; + sd_device_enumerator_get_device_next; + sd_device_enumerator_get_subsystem_first; + sd_device_enumerator_get_subsystem_next; + + sd_device_enumerator_add_match_subsystem; + sd_device_enumerator_add_match_sysattr; + sd_device_enumerator_add_match_property; + sd_device_enumerator_add_match_sysname; + sd_device_enumerator_add_match_tag; + sd_device_enumerator_add_match_parent; + sd_device_enumerator_allow_uninitialized; + + sd_device_unrefp; + sd_device_enumerator_unrefp; } LIBSYSTEMD_239; diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 212f99cf78..b77c891d1f 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -5,6 +5,7 @@ _systemd_headers = ''' sd-bus-protocol.h sd-bus-vtable.h sd-daemon.h + sd-device.h sd-event.h sd-id128.h sd-journal.h @@ -15,7 +16,6 @@ _systemd_headers = ''' # https://github.com/mesonbuild/meson/issues/1633 systemd_headers = files(_systemd_headers) -# sd-device.h # sd-hwdb.h # sd-dhcp6-client.h # sd-dhcp6-lease.h From ca7a9afc7e399b179d27324cdec328499d319b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 30 Sep 2018 20:34:11 +0200 Subject: [PATCH 2/4] test-sd-hwdb: add a simple test for export sd-hwdb functions --- src/shared/tests.h | 2 ++ src/test/meson.build | 4 +++ src/test/test-sd-hwdb.c | 63 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 src/test/test-sd-hwdb.c diff --git a/src/shared/tests.h b/src/shared/tests.h index 549959edf2..58a3e1c32d 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once +#include + char* setup_fake_runtime_dir(void); const char* get_testdata_dir(void); const char* get_catalog_dir(void); diff --git a/src/test/meson.build b/src/test/meson.build index 21a8c3b12b..63779374eb 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -661,6 +661,10 @@ tests += [ [['src/test/test-bus-util.c'], [], []], + + [['src/test/test-sd-hwdb.c'], + [], + []], ] ############################################################ diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c new file mode 100644 index 0000000000..dc6191c808 --- /dev/null +++ b/src/test/test-sd-hwdb.c @@ -0,0 +1,63 @@ +#include "sd-hwdb.h" + +#include "alloc-util.h" +#include "errno.h" +#include "tests.h" + +static void test_failed_enumerate(void) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb; + const char *key, *value; + + log_info("/* %s */", __func__); + + assert_se(sd_hwdb_new(&hwdb) == 0); + + assert_se(sd_hwdb_seek(hwdb, "no-such-modalias-should-exist") == 0); + + assert_se(sd_hwdb_enumerate(hwdb, &key, &value) == 0); + assert_se(sd_hwdb_enumerate(hwdb, &key, NULL) == -EINVAL); + assert_se(sd_hwdb_enumerate(hwdb, NULL, &value) == -EINVAL); +} + +#define DELL_MODALIAS \ + "evdev:atkbd:dmi:bvnXXX:bvrYYY:bdZZZ:svnDellXXX:pnYYY" + +static void test_basic_enumerate(void) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb; + const char *key, *value; + size_t len1 = 0, len2 = 0; + int r; + + log_info("/* %s */", __func__); + + assert_se(sd_hwdb_new(&hwdb) == 0); + + assert_se(sd_hwdb_seek(hwdb, DELL_MODALIAS) == 0); + + for (;;) { + r = sd_hwdb_enumerate(hwdb, &key, &value); + assert(IN_SET(r, 0, 1)); + if (r == 0) + break; + assert(key); + assert(value); + log_debug("A: \"%s\" → \"%s\"", key, value); + len1 += strlen(key) + strlen(value); + } + + SD_HWDB_FOREACH_PROPERTY(hwdb, DELL_MODALIAS, key, value) { + log_debug("B: \"%s\" → \"%s\"", key, value); + len2 += strlen(key) + strlen(value); + } + + assert_se(len1 == len2); +} + +int main(int argc, char *argv[]) { + test_setup_logging(LOG_DEBUG); + + test_failed_enumerate(); + test_basic_enumerate(); + + return 0; +} From 6083c4b763eb3c890396974335a47b880a55cdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 30 Sep 2018 20:36:51 +0200 Subject: [PATCH 3/4] libsystemd: export all functions in sd-hwdb.h sd-hwdb.h is now also installed in /usr/include/systemd. --- src/libsystemd/libsystemd.sym | 12 ++++++++++++ src/systemd/meson.build | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index a92b7a21e8..d06e95638e 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -636,4 +636,16 @@ global: sd_device_unrefp; sd_device_enumerator_unrefp; + + sd_hwdb_ref; + sd_hwdb_unref; + + sd_hwdb_new; + + sd_hwdb_get; + + sd_hwdb_seek; + sd_hwdb_enumerate; + + sd_hwdb_unrefp; } LIBSYSTEMD_239; diff --git a/src/systemd/meson.build b/src/systemd/meson.build index b77c891d1f..849502921d 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -7,6 +7,7 @@ _systemd_headers = ''' sd-daemon.h sd-device.h sd-event.h + sd-hwdb.h sd-id128.h sd-journal.h sd-login.h @@ -16,7 +17,6 @@ _systemd_headers = ''' # https://github.com/mesonbuild/meson/issues/1633 systemd_headers = files(_systemd_headers) -# sd-hwdb.h # sd-dhcp6-client.h # sd-dhcp6-lease.h # sd-dhcp-client.h From 4dd73b883f1825fb3d20870e71f8a4daafd369d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 1 Oct 2018 15:22:55 +0200 Subject: [PATCH 4/4] test-sd-hwdb: skip tests if hwdb cannot be opened --- src/test/test-sd-hwdb.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index dc6191c808..b67a8537bf 100644 --- a/src/test/test-sd-hwdb.c +++ b/src/test/test-sd-hwdb.c @@ -4,19 +4,25 @@ #include "errno.h" #include "tests.h" -static void test_failed_enumerate(void) { +static int test_failed_enumerate(void) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb; const char *key, *value; + int r; log_info("/* %s */", __func__); - assert_se(sd_hwdb_new(&hwdb) == 0); + r = sd_hwdb_new(&hwdb); + if (r == -ENOENT) + return r; + assert_se(r == 0); assert_se(sd_hwdb_seek(hwdb, "no-such-modalias-should-exist") == 0); assert_se(sd_hwdb_enumerate(hwdb, &key, &value) == 0); assert_se(sd_hwdb_enumerate(hwdb, &key, NULL) == -EINVAL); assert_se(sd_hwdb_enumerate(hwdb, NULL, &value) == -EINVAL); + + return 0; } #define DELL_MODALIAS \ @@ -54,9 +60,14 @@ static void test_basic_enumerate(void) { } int main(int argc, char *argv[]) { + int r; + test_setup_logging(LOG_DEBUG); - test_failed_enumerate(); + r = test_failed_enumerate(); + if (r < 0) + return log_tests_skipped_errno(r, "cannot open hwdb"); + test_basic_enumerate(); return 0;