test-path: move all related test files to a specific directory

To avoid polluting test/

diff --git a/Makefile.am b/Makefile.am
index 4319c2fdb7a504d067dd3daa648e0a2466d75ebd..be001bd09ec1928afd5989baa9a396f6f414a45e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1515,7 +1515,6 @@ EXTRA_DIST += \
        test/h.service \
        test/parent-deep.slice \
        test/parent.slice \
-       test/paths.target \
        test/sched_idle_bad.service \
        test/sched_idle_ok.service \
        test/sched_rr_bad.service \
@@ -1529,21 +1528,24 @@ EXTRA_DIST += \
        test/testsuite.target \
        test/timers.target \
        test/unstoppable.service \
-       test/path-changed.service \
-       test/path-directorynotempty.service \
-       test/path-existsglob.service \
-       test/path-exists.service \
-       test/path-makedirectory.service \
-       test/path-modified.service \
-       test/path-mycustomunit.service \
-       test/path-service.service \
-       test/path-changed.path \
-       test/path-directorynotempty.path \
-       test/path-existsglob.path \
-       test/path-exists.path \
-       test/path-makedirectory.path \
-       test/path-modified.path \
-       test/path-unit.path \
+       test/test-path/paths.target \
+       test/test-path/basic.target \
+       test/test-path/sysinit.target \
+       test/test-path/path-changed.service \
+       test/test-path/path-directorynotempty.service \
+       test/test-path/path-existsglob.service \
+       test/test-path/path-exists.service \
+       test/test-path/path-makedirectory.service \
+       test/test-path/path-modified.service \
+       test/test-path/path-mycustomunit.service \
+       test/test-path/path-service.service \
+       test/test-path/path-changed.path \
+       test/test-path/path-directorynotempty.path \
+       test/test-path/path-existsglob.path \
+       test/test-path/path-exists.path \
+       test/test-path/path-makedirectory.path \
+       test/test-path/path-modified.path \
+       test/test-path/path-unit.path \
        test/test-execute/exec-environment-empty.service \
        test/test-execute/exec-environment-multiple.service \
        test/test-execute/exec-environment.service \

diff --git a/src/test/test-path.c b/src/test/test-path.c
index ff0f044958b29ed12369999f38b21c0e170fa40f..8302bdd28302a0f0e4525fe933d73f15e5a1afeb 100644 (file)
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -258,7 +258,7 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        assert_se(set_unit_path(TEST_DIR) >= 0);
+        assert_se(set_unit_path(TEST_DIR "/test-path/") >= 0);
 
         for (test = tests; test && *test; test++) {
                 int r;

diff --git a/test/paths.target b/test/paths.target
deleted file mode 120000 (symlink)
index e9939c9..0000000
--- a/test/paths.target
+++ /dev/null
@@ -1 +0,0 @@
-../units/paths.target
\ No newline at end of file

diff --git a/test/test-path/basic.target b/test/test-path/basic.target
new file mode 120000 (symlink)
index 0000000..a882b72
--- /dev/null
+++ b/test/test-path/basic.target
@@ -0,0 +1 @@
+../../units/basic.target
\ No newline at end of file

diff --git a/test/path-changed.path b/test/test-path/path-changed.path
similarity index 100%
rename from test/path-changed.path
rename to test/test-path/path-changed.path

diff --git a/test/path-changed.service b/test/test-path/path-changed.service
similarity index 100%
rename from test/path-changed.service
rename to test/test-path/path-changed.service

diff --git a/test/path-directorynotempty.path b/test/test-path/path-directorynotempty.path
similarity index 100%
rename from test/path-directorynotempty.path
rename to test/test-path/path-directorynotempty.path

diff --git a/test/path-directorynotempty.service b/test/test-path/path-directorynotempty.service
similarity index 100%
rename from test/path-directorynotempty.service
rename to test/test-path/path-directorynotempty.service

diff --git a/test/path-exists.path b/test/test-path/path-exists.path
similarity index 100%
rename from test/path-exists.path
rename to test/test-path/path-exists.path

diff --git a/test/path-exists.service b/test/test-path/path-exists.service
similarity index 100%
rename from test/path-exists.service
rename to test/test-path/path-exists.service

diff --git a/test/path-existsglob.path b/test/test-path/path-existsglob.path
similarity index 100%
rename from test/path-existsglob.path
rename to test/test-path/path-existsglob.path

diff --git a/test/path-existsglob.service b/test/test-path/path-existsglob.service
similarity index 100%
rename from test/path-existsglob.service
rename to test/test-path/path-existsglob.service

diff --git a/test/path-makedirectory.path b/test/test-path/path-makedirectory.path
similarity index 100%
rename from test/path-makedirectory.path
rename to test/test-path/path-makedirectory.path

diff --git a/test/path-makedirectory.service b/test/test-path/path-makedirectory.service
similarity index 100%
rename from test/path-makedirectory.service
rename to test/test-path/path-makedirectory.service

diff --git a/test/path-modified.path b/test/test-path/path-modified.path
similarity index 100%
rename from test/path-modified.path
rename to test/test-path/path-modified.path

diff --git a/test/path-modified.service b/test/test-path/path-modified.service
similarity index 100%
rename from test/path-modified.service
rename to test/test-path/path-modified.service

diff --git a/test/path-mycustomunit.service b/test/test-path/path-mycustomunit.service
similarity index 100%
rename from test/path-mycustomunit.service
rename to test/test-path/path-mycustomunit.service

diff --git a/test/path-service.service b/test/test-path/path-service.service
similarity index 100%
rename from test/path-service.service
rename to test/test-path/path-service.service

diff --git a/test/path-unit.path b/test/test-path/path-unit.path
similarity index 100%
rename from test/path-unit.path
rename to test/test-path/path-unit.path

diff --git a/test/test-path/paths.target b/test/test-path/paths.target
new file mode 120000 (symlink)
index 0000000..b402796
--- /dev/null
+++ b/test/test-path/paths.target
@@ -0,0 +1 @@
+../../units/paths.target
\ No newline at end of file

diff --git a/test/test-path/sysinit.target b/test/test-path/sysinit.target
new file mode 120000 (symlink)
index 0000000..9d10e5b
--- /dev/null
+++ b/test/test-path/sysinit.target
@@ -0,0 +1 @@
+../../units/sysinit.target
\ No newline at end of file