Rename $TEST_DIR to $SYSTEMD_TEST_DATA, document it

TEST_DIR is rather generic, and we prefix all variables used by installed
executables with "SYSTEMD_".

diff --git a/ENVIRONMENT.md b/ENVIRONMENT.md
index 1ad2addfeefd2bbcdb1608d51f19390c7d86177b..e542d4ec6fda3bd4f07b3e1cdb81992e83e75aa0 100644 (file)
--- a/ENVIRONMENT.md
+++ b/ENVIRONMENT.md
@@ -59,3 +59,8 @@ systemd-logind:
 * `$SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK=1` — if set, report that
   hibernation is available even if the swap devices do not provide enough room
   for it.
+
+installed systemd tests:
+
+* `$SYSTEMD_TEST_DATA` — override the location of test data. This is useful if
+  a test executable is moved to an arbitrary location.

diff --git a/Makefile.am b/Makefile.am
index c725d6d1aced9605ba3fa3e391a3fa40fc5cee6b..a0eda73cb41e3211b706b83cdd6f6d8e9fd82581 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,7 @@ endif
 AM_TESTS_ENVIRONMENT = \
        export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \
        export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map; \
-       export TEST_DIR=$(abs_top_srcdir)/test; \
+       export SYSTEMD_TEST_DATA=$(abs_top_srcdir)/test; \
        export PATH=$(abs_top_builddir):$$PATH;
 
 if ENABLE_BASH_COMPLETION

diff --git a/src/shared/tests.c b/src/shared/tests.c
index 189aa36bc6948baf2bf293e053b9f1298b5d48a0..bae113bdc8f9f054eec9c7e52e1707fb8664362c 100644 (file)
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -43,7 +43,7 @@ const char* get_exe_relative_testdata_dir(void) {
         assert_se(readlink_and_make_absolute("/proc/self/exe", &exedir) >= 0);
         assert_se(snprintf(testdir, sizeof(testdir), "%s/testdata", dirname(exedir)) > 0);
         if (access(testdir, F_OK) < 0) {
-                fprintf(stderr,  "Test data directory '%s' does not exist, set $TEST_DIR\n", testdir);
+                fprintf(stderr,  "Test data directory '%s' does not exist, set $SYSTEMD_TEST_DATA\n", testdir);
                 exit(1);
         }
         return testdir;

diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 4e633ae6d81d17ba7c438aa2b5a93262010627dd..02608434be4c49464a5b218078e09ff8642fbd3f 100644 (file)
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -43,4 +43,4 @@
                )
 
 #define TEST_DATA_DIR(subdir)                                     \
-        strjoina(getenv("TEST_DIR") ?: get_exe_relative_testdata_dir(), subdir)
+        strjoina(getenv("SYSTEMD_TEST_DATA") ?: get_exe_relative_testdata_dir(), subdir)