You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
systemd/SOURCES/0351-test-move-TEST-23-s-un...

77 lines
4.2 KiB

From 82168bbf3db85a2e58b333794db5ce5b456ac91c Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 10 May 2023 14:02:54 +0200
Subject: [PATCH] test: move TEST-23's units into a dedicated subfolder
To remain consistent with other tests.
(cherry picked from commit 8412cdf4fd0576428d4d22949ef831bd4d51326d)
Related: #2213521
---
test/meson.build | 3 +++
.../testsuite-23-binds-to.service | 0
.../testsuite-23-bound-by.service | 0
test/{units => testsuite-23.units}/testsuite-23-fail.service | 0
.../testsuite-23-prop-stop-one.service | 0
.../testsuite-23-prop-stop-two.service | 0
.../testsuite-23-short-lived.service | 0
.../{units => testsuite-23.units}/testsuite-23-success.service | 0
test/{units => testsuite-23.units}/testsuite-23-uphold.service | 0
9 files changed, 3 insertions(+)
rename test/{units => testsuite-23.units}/testsuite-23-binds-to.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-bound-by.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-fail.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-prop-stop-one.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-prop-stop-two.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-short-lived.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-success.service (100%)
rename test/{units => testsuite-23.units}/testsuite-23-uphold.service (100%)
diff --git a/test/meson.build b/test/meson.build
index 92c92dcb3b..3ca544690a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -48,6 +48,9 @@ if install_tests
install_subdir('testsuite-16.units',
exclude_files : '.gitattributes',
install_dir : testdata_dir)
+ install_subdir('testsuite-23.units',
+ exclude_files : '.gitattributes',
+ install_dir : testdata_dir)
install_subdir('testsuite-28.units',
exclude_files : '.gitattributes',
install_dir : testdata_dir)
diff --git a/test/units/testsuite-23-binds-to.service b/test/testsuite-23.units/testsuite-23-binds-to.service
similarity index 100%
rename from test/units/testsuite-23-binds-to.service
rename to test/testsuite-23.units/testsuite-23-binds-to.service
diff --git a/test/units/testsuite-23-bound-by.service b/test/testsuite-23.units/testsuite-23-bound-by.service
similarity index 100%
rename from test/units/testsuite-23-bound-by.service
rename to test/testsuite-23.units/testsuite-23-bound-by.service
diff --git a/test/units/testsuite-23-fail.service b/test/testsuite-23.units/testsuite-23-fail.service
similarity index 100%
rename from test/units/testsuite-23-fail.service
rename to test/testsuite-23.units/testsuite-23-fail.service
diff --git a/test/units/testsuite-23-prop-stop-one.service b/test/testsuite-23.units/testsuite-23-prop-stop-one.service
similarity index 100%
rename from test/units/testsuite-23-prop-stop-one.service
rename to test/testsuite-23.units/testsuite-23-prop-stop-one.service
diff --git a/test/units/testsuite-23-prop-stop-two.service b/test/testsuite-23.units/testsuite-23-prop-stop-two.service
similarity index 100%
rename from test/units/testsuite-23-prop-stop-two.service
rename to test/testsuite-23.units/testsuite-23-prop-stop-two.service
diff --git a/test/units/testsuite-23-short-lived.service b/test/testsuite-23.units/testsuite-23-short-lived.service
similarity index 100%
rename from test/units/testsuite-23-short-lived.service
rename to test/testsuite-23.units/testsuite-23-short-lived.service
diff --git a/test/units/testsuite-23-success.service b/test/testsuite-23.units/testsuite-23-success.service
similarity index 100%
rename from test/units/testsuite-23-success.service
rename to test/testsuite-23.units/testsuite-23-success.service
diff --git a/test/units/testsuite-23-uphold.service b/test/testsuite-23.units/testsuite-23-uphold.service
similarity index 100%
rename from test/units/testsuite-23-uphold.service
rename to test/testsuite-23.units/testsuite-23-uphold.service