test: drop TEST_DATA_DIR, fold into get_testdata_dir()

Drop the TEST_DATA_DIR macro as this was using alloca() within a
function call which is allegedly unsafe. So add a "suffix" argument to
get_testdata_dir() instead and call that directly.

2 files changed, 26 insertions, 21 deletions

diff --git a/src/shared/tests.c b/src/shared/tests.c
index be098b304c..f300bbc66f 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -36,33 +36,38 @@ char* setup_fake_runtime_dir(void) {
         return p;
 }
 
-const char* get_testdata_dir(void) {
+const char* get_testdata_dir(const char *suffix) {
         const char *env;
-        _cleanup_free_ char *exedir = NULL;
         /* convenience: caller does not need to free result */
         static char testdir[PATH_MAX];
 
         /* if the env var is set, use that */
         env = getenv("SYSTEMD_TEST_DATA");
+        testdir[sizeof(testdir) - 1] = '\0';
         if (env) {
-                if (access(env, F_OK) >= 0)
-                        return env;
-
-                fputs("ERROR: $SYSTEMD_TEST_DATA directory does not exist\n", stderr);
-                exit(1);
+                if (access(env, F_OK) < 0) {
+                        fputs("ERROR: $SYSTEMD_TEST_DATA directory does not exist\n", stderr);
+                        exit(1);
+                }
+                strncpy(testdir, env, sizeof(testdir) - 1);
+        } else {
+                _cleanup_free_ char *exedir = NULL;
+                assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0);
+
+                /* Check if we're running from the builddir. If so, use the compiled in path. */
+                if (path_startswith(exedir, ABS_BUILD_DIR))
+                        assert_se(snprintf(testdir, sizeof(testdir), "%s/test", ABS_SRC_DIR) > 0);
+                else
+                        /* Try relative path, according to the install-test layout */
+                        assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0);
+
+                /* test this without the suffix, as it may contain a glob */
+                if (access(testdir, F_OK) < 0) {
+                        fputs("ERROR: Cannot find testdata directory, set $SYSTEMD_TEST_DATA\n", stderr);
+                        exit(1);
+                }
         }
 
-        assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0);
-
-        /* Check if we're running from the builddir. If so, use the compiled in path. */
-        if (path_startswith(exedir, ABS_BUILD_DIR))
-                return ABS_SRC_DIR "/test";
-
-        /* Try relative path, according to the install-test layout */
-        assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0);
-        if (access(testdir, F_OK) >= 0)
-                return testdir;
-
-        fputs("ERROR: Cannot find testdata directory, set $SYSTEMD_TEST_DATA\n", stderr);
-        exit(1);
+        strncpy(testdir + strlen(testdir), suffix, sizeof(testdir) - strlen(testdir) - 1);
+        return testdir;
 }
diff --git a/src/shared/tests.h b/src/shared/tests.h
index 927b9fc2bb..7055124990 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -20,4 +20,4 @@
 ***/
 
 char* setup_fake_runtime_dir(void);
-const char* get_testdata_dir(void);
+const char* get_testdata_dir(const char *suffix);