test: merge TEST-27-STDOUTFILE into TEST-23-UNIT-FILE

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

diff --git a/test/TEST-27-STDOUTFILE/test.sh b/test/TEST-27-STDOUTFILE/test.sh
deleted file mode 100755 (executable)
index 15229ba..0000000
--- a/test/TEST-27-STDOUTFILE/test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-TEST_DESCRIPTION="test StandardOutput=file:"
-
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
-do_test "$@"

diff --git a/test/units/testsuite-23.StandardOutput.sh b/test/units/testsuite-23.StandardOutput.sh
new file mode 100755 (executable)
index 0000000..50b9ac2
--- /dev/null
+++ b/test/units/testsuite-23.StandardOutput.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -eux
+set -o pipefail
+
+# Test StandardOutput=file:
+
+systemd-analyze log-level debug
+
+systemd-run --wait --unit=testsuite-23-standard-output-one \
+            -p StandardOutput=file:/tmp/stdout \
+            -p StandardError=file:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo x ; echo y >&2'
+cmp /tmp/stdout <<EOF
+x
+EOF
+cmp /tmp/stderr <<EOF
+y
+EOF
+
+systemd-run --wait --unit=testsuite-23-standard-output-two \
+            -p StandardOutput=file:/tmp/stdout \
+            -p StandardError=file:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo z ; echo a >&2'
+cmp /tmp/stdout <<EOF
+z
+EOF
+cmp /tmp/stderr <<EOF
+a
+EOF
+
+systemd-run --wait --unit=testsuite-23-standard-output-three \
+            -p StandardOutput=append:/tmp/stdout \
+            -p StandardError=append:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo b ; echo c >&2'
+cmp /tmp/stdout <<EOF
+z
+b
+EOF
+cmp /tmp/stderr <<EOF
+a
+c
+EOF
+
+systemd-run --wait --unit=testsuite-23-standard-output-four \
+            -p StandardOutput=truncate:/tmp/stdout \
+            -p StandardError=truncate:/tmp/stderr \
+            -p Type=exec \
+            sh -c 'echo a ; echo b >&2'
+cmp /tmp/stdout <<EOF
+a
+EOF
+cmp /tmp/stderr <<EOF
+b
+EOF
+
+systemd-analyze log-level info

diff --git a/test/units/testsuite-27.service b/test/units/testsuite-27.service
deleted file mode 100644 (file)
index 454fde6..0000000
--- a/test/units/testsuite-27.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-27-STDOUTFILE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot

diff --git a/test/units/testsuite-27.sh b/test/units/testsuite-27.sh
deleted file mode 100755 (executable)
index c0701f3..0000000
--- a/test/units/testsuite-27.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -eux
-set -o pipefail
-
-systemd-analyze log-level debug
-
-systemd-run --wait --unit=test27-one \
-            -p StandardOutput=file:/tmp/stdout \
-            -p StandardError=file:/tmp/stderr \
-            -p Type=exec \
-            sh -c 'echo x ; echo y >&2'
-cmp /tmp/stdout <<EOF
-x
-EOF
-cmp /tmp/stderr <<EOF
-y
-EOF
-
-systemd-run --wait --unit=test27-two \
-            -p StandardOutput=file:/tmp/stdout \
-            -p StandardError=file:/tmp/stderr \
-            -p Type=exec \
-            sh -c 'echo z ; echo a >&2'
-cmp /tmp/stdout <<EOF
-z
-EOF
-cmp /tmp/stderr <<EOF
-a
-EOF
-
-systemd-run --wait --unit=test27-three \
-            -p StandardOutput=append:/tmp/stdout \
-            -p StandardError=append:/tmp/stderr \
-            -p Type=exec \
-            sh -c 'echo b ; echo c >&2'
-cmp /tmp/stdout <<EOF
-z
-b
-EOF
-cmp /tmp/stderr <<EOF
-a
-c
-EOF
-
-systemd-run --wait --unit=test27-four \
-            -p StandardOutput=truncate:/tmp/stdout \
-            -p StandardError=truncate:/tmp/stderr \
-            -p Type=exec \
-            sh -c 'echo a ; echo b >&2'
-cmp /tmp/stdout <<EOF
-a
-EOF
-cmp /tmp/stderr <<EOF
-b
-EOF
-
-systemd-analyze log-level info
-
-echo OK >/testok
-
-exit 0