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-27.sh b/test/units/testsuite-23.StandardOutput.sh
similarity index 79%
rename from test/units/testsuite-27.sh
rename to test/units/testsuite-23.StandardOutput.sh
index c0701f35c30d5bba7131acc3c24631d13dca465c..50b9ac2a2b9b6694b61fed7a014c346e6e0585a5 100755 (executable)
--- a/test/units/testsuite-27.sh
+++ b/test/units/testsuite-23.StandardOutput.sh
@@ -3,9 +3,11 @@
 set -eux
 set -o pipefail
 
+# Test StandardOutput=file:
+
 systemd-analyze log-level debug
 
-systemd-run --wait --unit=test27-one \
+systemd-run --wait --unit=testsuite-23-standard-output-one \
             -p StandardOutput=file:/tmp/stdout \
             -p StandardError=file:/tmp/stderr \
             -p Type=exec \
@@ -17,7 +19,7 @@ cmp /tmp/stderr <<EOF
 y
 EOF
 
-systemd-run --wait --unit=test27-two \
+systemd-run --wait --unit=testsuite-23-standard-output-two \
             -p StandardOutput=file:/tmp/stdout \
             -p StandardError=file:/tmp/stderr \
             -p Type=exec \
@@ -29,7 +31,7 @@ cmp /tmp/stderr <<EOF
 a
 EOF
 
-systemd-run --wait --unit=test27-three \
+systemd-run --wait --unit=testsuite-23-standard-output-three \
             -p StandardOutput=append:/tmp/stdout \
             -p StandardError=append:/tmp/stderr \
             -p Type=exec \
@@ -43,7 +45,7 @@ a
 c
 EOF
 
-systemd-run --wait --unit=test27-four \
+systemd-run --wait --unit=testsuite-23-standard-output-four \
             -p StandardOutput=truncate:/tmp/stdout \
             -p StandardError=truncate:/tmp/stderr \
             -p Type=exec \
@@ -56,7 +58,3 @@ b
 EOF
 
 systemd-analyze log-level info
-
-echo OK >/testok
-
-exit 0

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