diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-16 18:42:14 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-16 21:49:09 +0200 |
| commit | 9245eb3cbd8cf014744ef814f292d88e95c935a5 (patch) | |
| tree | 2003b7b7fcab3c9a52bb9075a5fdfffffd2d5db1 | |
| parent | b4d42a82eb95eada226856722f49dc8d898df8f2 (diff) | |
| download | systemd-9245eb3cbd8cf014744ef814f292d88e95c935a5.tar.gz | |
test: merge TEST-27-STDOUTFILE into TEST-23-UNIT-FILE
| l--------- | test/TEST-27-STDOUTFILE/Makefile | 1 | ||||
| -rwxr-xr-x | test/TEST-27-STDOUTFILE/test.sh | 10 | ||||
| -rwxr-xr-x | test/units/testsuite-23.StandardOutput.sh (renamed from test/units/testsuite-27.sh) | 14 | ||||
| -rw-r--r-- | test/units/testsuite-27.service | 8 |
4 files changed, 6 insertions, 27 deletions
diff --git a/test/TEST-27-STDOUTFILE/Makefile b/test/TEST-27-STDOUTFILE/Makefile deleted file mode 120000 index e9f93b1104..0000000000 --- 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 index 15229ba018..0000000000 --- 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 index c0701f35c3..50b9ac2a2b 100755 --- 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 index 454fde6108..0000000000 --- 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 |