test: merge TEST-09-ISSUE-2691 into TEST-07-PID1

diff --git a/test/TEST-09-ISSUE-2691/Makefile b/test/TEST-09-ISSUE-2691/Makefile
deleted file mode 120000 (symlink)
index e9f93b1..0000000
--- a/test/TEST-09-ISSUE-2691/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile
\ No newline at end of file

diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
deleted file mode 100755 (executable)
index 3fc243c..0000000
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2691"
-TEST_NO_NSPAWN=1
-
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
-do_test "$@"

diff --git a/test/units/testsuite-07.service b/test/units/testsuite-07.service
index c478e123608aa8b386ddf8750bae60d34d09f47b..f45b9c7c5bf9efe48a8bcc434945486a3590ad5c 100644 (file)
--- a/test/units/testsuite-07.service
+++ b/test/units/testsuite-07.service
@@ -3,6 +3,10 @@
 Description=TEST-07-ISSUE-1981
 
 [Service]
+Type=oneshot
 ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
+# Issue: https://github.com/systemd/systemd/issues/2691
+ExecStop=sh -c 'kill -SEGV $$$$'
+RemainAfterExit=yes
+TimeoutStopSec=270s

diff --git a/test/units/testsuite-09.service b/test/units/testsuite-09.service
deleted file mode 100644 (file)
index 6f6cd9c..0000000
--- a/test/units/testsuite-09.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-09-ISSUE-2691
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=sh -c '>/testok'
-ExecStop=sh -c 'kill -SEGV $$$$'
-Type=oneshot
-RemainAfterExit=yes
-TimeoutStopSec=270s