test: move TEST-27-STDOUTFILE setup to static files

2 files changed, 1 insertions, 65 deletions

diff --git a/test/TEST-27-STDOUTFILE/test.sh b/test/TEST-27-STDOUTFILE/test.sh
index 66c98e5675..80c4b0920c 100755
--- a/test/TEST-27-STDOUTFILE/test.sh
+++ b/test/TEST-27-STDOUTFILE/test.sh
@@ -13,22 +13,8 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-        inst_binary cmp
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/testsuite.sh
-Type=oneshot
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
     )
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 27
diff --git a/test/TEST-27-STDOUTFILE/testsuite.sh b/test/TEST-27-STDOUTFILE/testsuite.sh
deleted file mode 100755
index c522f75dbc..0000000000
--- a/test/TEST-27-STDOUTFILE/testsuite.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-set -o pipefail
-
-systemd-analyze log-level debug
-systemd-analyze log-target console
-
-systemd-run --wait --unit=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=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=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-analyze log-level info
-
-echo OK > /testok
-
-exit 0