test: move TEST-46-HOMED to static files

diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh
index 99fd5b85b81dc904f1dfede3b4b486d638c87df8..5e87cf6143bae89e4c4a1329420a30b9ca7cb4d9 100755 (executable)
--- a/test/TEST-46-HOMED/test.sh
+++ b/test/TEST-46-HOMED/test.sh
@@ -16,22 +16,6 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-Before=getty-pre.target
-Wants=getty-pre.target
-
-[Service]
-ExecStart=/bin/bash -x /testsuite.sh
-Type=oneshot
-NotifyAccess=all
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
     ) || return 1
     setup_nspawn_root
 
@@ -39,4 +23,4 @@ EOF
     umount $TESTDIR/root
 }
 
-do_test "$@"
+do_test "$@" 46

diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service
new file mode 100644 (file)
index 0000000..46e9a61
--- /dev/null
+++ b/test/units/testsuite-46.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TEST-46-HOMED
+Before=getty-pre.target
+Wants=getty-pre.target
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
+NotifyAccess=all

diff --git a/test/TEST-46-HOMED/testsuite.sh b/test/units/testsuite-46.sh
similarity index 100%
rename from test/TEST-46-HOMED/testsuite.sh
rename to test/units/testsuite-46.sh