From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 26 Mar 2020 16:40:33 +0000 (+0100)
Subject: sd-path: handle case of missing runtime dir in test
X-Git-Tag: v246-rc1~685^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e09fa89068fb191010e8f927dd20463c31d7bb4;p=thirdparty%2Fsystemd.git

sd-path: handle case of missing runtime dir in test

Also document it in the man page.
---

diff --git a/man/sd_path_lookup.xml b/man/sd_path_lookup.xml
index 35a1109af38..68c6812ab17 100644
--- a/man/sd_path_lookup.xml
+++ b/man/sd_path_lookup.xml
@@ -172,6 +172,14 @@
           <listitem><para>Output argument is <constant>NULL</constant>.</para></listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term><constant>-ENXIO</constant></term>
+
+          <listitem><para>Query failed because of an undefined environment variable (e.g. for
+          <constant>SD_PATH_USER_RUNTIME</constant> when <varname>$XDG_RUNTIME_DIR</varname> is not
+          defined).</para></listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><constant>-ENOMEM</constant></term>
 
diff --git a/src/test/test-sd-path.c b/src/test/test-sd-path.c
index 5888d3b9f94..9260db5acee 100644
--- a/src/test/test-sd-path.c
+++ b/src/test/test-sd-path.c
@@ -11,9 +11,13 @@ static void test_sd_path_lookup(void) {
         log_info("/* %s */", __func__);
 
         for (uint64_t i = 0; i < _SD_PATH_MAX; i++) {
-                _cleanup_free_ char *t, *s;
+                _cleanup_free_ char *t = NULL, *s = NULL;
+                int r;
 
-                assert_se(sd_path_lookup(i, NULL, &t) == 0);
+                r = sd_path_lookup(i, NULL, &t);
+                if (i == SD_PATH_USER_RUNTIME && r == -ENXIO)
+                        continue;
+                assert_se(r == 0);
                 assert_se(t);
                 log_info("%02"PRIu64": \"%s\"", i, t);
 
@@ -31,10 +35,14 @@ static void test_sd_path_lookup_strv(void) {
         log_info("/* %s */", __func__);
 
         for (uint64_t i = 0; i < _SD_PATH_MAX; i++) {
-                _cleanup_strv_free_ char **t, **s;
+                _cleanup_strv_free_ char **t = NULL, **s = NULL;
                 char **item;
+                int r;
 
-                assert_se(sd_path_lookup_strv(i, NULL, &t) == 0);
+                r = sd_path_lookup_strv(i, NULL, &t);
+                if (i == SD_PATH_USER_RUNTIME && r == -ENXIO)
+                        continue;
+                assert_se(r == 0);
                 assert_se(t);
                 log_info("%02"PRIu64":", i);
                 STRV_FOREACH(item, t)