test: move TEST-07-ISSUE-1981 setup to static files

2019-12-09 19:51:17 +01:00 · 2019-12-09 19:51:17 +01:00 · 58a1bdb467
parent 4caa1ac794
commit 58a1bdb467
3 changed files with 7 additions and 15 deletions
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@ -17,22 +17,8 @@ test_setup() {

        setup_basic_environment
        mask_supporting_services
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/test-segfault.sh
-Type=oneshot
-EOF
-
-        cp test-segfault.sh $initdir/
-
-        setup_testsuite
    )
    setup_nspawn_root
 }

-do_test "$@"
+do_test "$@" 07
--- a/test/units/testsuite-07.service
+++ b/test/units/testsuite-07.service
@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-07-ISSUE-1981
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot
--- a/test/TEST-07-ISSUE-1981/test-segfault.sh
+++ b/test/TEST-07-ISSUE-1981/test-segfault.sh