From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 9 Dec 2019 19:27:40 +0000 (+0100)
Subject: test: move TEST-09-ISSUE-2691 setup to static files
X-Git-Tag: v246-rc1~682^2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e88302002fcea6cd8adc0fcac0d08e2daf8c6452;p=thirdparty%2Fsystemd.git

test: move TEST-09-ISSUE-2691 setup to static files
---

diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
index efe75d140b6..753a4a9868f 100755
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ b/test/TEST-09-ISSUE-2691/test.sh
@@ -16,22 +16,7 @@ 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]
-Type=oneshot
-ExecStart=/bin/sh -c '>/testok'
-RemainAfterExit=yes
-ExecStop=/bin/sh -c 'kill -SEGV $$$$'
-TimeoutStopSec=270s
-EOF
-
-        setup_testsuite
     )
 }
 
-do_test "$@"
+do_test "$@" 09
diff --git a/test/units/testsuite-09.service b/test/units/testsuite-09.service
new file mode 100644
index 00000000000..d551501335c
--- /dev/null
+++ b/test/units/testsuite-09.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=TEST-09-ISSUE-2691
+
+[Service]
+ExecStart=sh -c '>/testok'
+ExecStop=sh -c 'kill -SEGV $$$$'
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStopSec=270s