test: move TEST-22-TMPFILES setup to static files

12 files changed, 1 insertions, 660 deletions

diff --git a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh b/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
deleted file mode 100755
index a0158f0421..0000000000
--- a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
->/failed
-
-for t in test-*.sh; do
-        echo "Running $t"; ./$t
-done
-
-touch /testok
-rm /failed
diff --git a/test/TEST-22-TMPFILES/test-01.sh b/test/TEST-22-TMPFILES/test-01.sh
deleted file mode 100755
index d233e37fb2..0000000000
--- a/test/TEST-22-TMPFILES/test-01.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/bash
-#
-# With "e" don't attempt to set permissions when file doesn't exist, see
-# https://github.com/systemd/systemd/pull/6682.
-#
-
-set -e
-
-rm -fr /tmp/test
-
-echo "e /tmp/test - root root 1d" | systemd-tmpfiles --create -
-
-! test -e /tmp/test
diff --git a/test/TEST-22-TMPFILES/test-02.sh b/test/TEST-22-TMPFILES/test-02.sh
deleted file mode 100755
index d1bf1ea04b..0000000000
--- a/test/TEST-22-TMPFILES/test-02.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#! /bin/bash
-#
-# Basic tests for types creating directories
-#
-
-set -e
-set -x
-
-rm -fr /tmp/{C,d,D,e}
-mkdir  /tmp/{C,d,D,e}
-
-#
-# 'd'
-#
-mkdir /tmp/d/2
-chmod 777 /tmp/d/2
-
-systemd-tmpfiles --create - <<EOF
-d     /tmp/d/1    0755 daemon daemon - -
-d     /tmp/d/2    0755 daemon daemon - -
-EOF
-
-test -d /tmp/d/1
-test $(stat -c %U:%G:%a /tmp/d/1) = "daemon:daemon:755"
-
-test -d /tmp/d/2
-test $(stat -c %U:%G:%a /tmp/d/2) = "daemon:daemon:755"
-
-#
-# 'D'
-#
-mkdir /tmp/D/2
-chmod 777 /tmp/D/2
-touch /tmp/D/2/foo
-
-systemd-tmpfiles --create - <<EOF
-D     /tmp/D/1    0755 daemon daemon - -
-D     /tmp/D/2    0755 daemon daemon - -
-EOF
-
-test -d /tmp/D/1
-test $(stat -c %U:%G:%a /tmp/D/1) = "daemon:daemon:755"
-
-test -d /tmp/D/2
-test $(stat -c %U:%G:%a /tmp/D/2) = "daemon:daemon:755"
-
-systemd-tmpfiles --remove - <<EOF
-D     /tmp/D/2    0755 daemon daemon - -
-EOF
-
-# the content of '2' should be removed
-test "$(echo /tmp/D/2/*)" = "/tmp/D/2/*"
-
-#
-# 'e'
-#
-mkdir -p /tmp/e/2/{d1,d2}
-chmod 777 /tmp/e/2
-chmod 777 /tmp/e/2/d*
-
-systemd-tmpfiles --create - <<EOF
-e     /tmp/e/1     0755 daemon daemon - -
-e     /tmp/e/2/*   0755 daemon daemon - -
-EOF
-
-! test -d /tmp/e/1
-
-test -d /tmp/e/2
-test $(stat -c %U:%G:%a /tmp/e/2) = "root:root:777"
-
-test -d /tmp/e/2/d1
-test $(stat -c %U:%G:%a /tmp/e/2/d1) = "daemon:daemon:755"
-test -d /tmp/e/2/d2
-test $(stat -c %U:%G:%a /tmp/e/2/d2) = "daemon:daemon:755"
-
-# 'e' operates on directories only
-mkdir -p /tmp/e/3/{d1,d2}
-chmod 777 /tmp/e/3
-chmod 777 /tmp/e/3/d*
-touch /tmp/e/3/f1
-chmod 644 /tmp/e/3/f1
-
-! systemd-tmpfiles --create - <<EOF
-e     /tmp/e/3/*   0755 daemon daemon - -
-EOF
-
-# the directories should have been processed although systemd-tmpfiles failed
-# previously due to the presence of a file.
-test -d /tmp/e/3/d1
-test $(stat -c %U:%G:%a /tmp/e/3/d1) = "daemon:daemon:755"
-test -d /tmp/e/3/d2
-test $(stat -c %U:%G:%a /tmp/e/3/d2) = "daemon:daemon:755"
-
-test -f /tmp/e/3/f1
-test $(stat -c %U:%G:%a /tmp/e/3/f1) = "root:root:644"
-
-#
-# 'C'
-#
-
-mkdir /tmp/C/{1,2,3}-origin
-touch /tmp/C/{1,2,3}-origin/f1
-chmod 755 /tmp/C/{1,2,3}-origin/f1
-
-mkdir /tmp/C/{2,3}
-touch /tmp/C/3/f1
-
-systemd-tmpfiles --create - <<EOF
-C     /tmp/C/1    0755 daemon daemon - /tmp/C/1-origin
-C     /tmp/C/2    0755 daemon daemon - /tmp/C/2-origin
-EOF
-
-test -d /tmp/C/1
-test $(stat -c %U:%G:%a /tmp/C/1/f1) = "daemon:daemon:755"
-test -d /tmp/C/2
-test $(stat -c %U:%G:%a /tmp/C/2/f1) = "daemon:daemon:755"
-
-! systemd-tmpfiles --create - <<EOF
-C     /tmp/C/3    0755 daemon daemon - /tmp/C/3-origin
-EOF
-
-test $(stat -c %U:%G:%a /tmp/C/3/f1) = "root:root:644"
diff --git a/test/TEST-22-TMPFILES/test-03.sh b/test/TEST-22-TMPFILES/test-03.sh
deleted file mode 100755
index 8d009fb5bb..0000000000
--- a/test/TEST-22-TMPFILES/test-03.sh
+++ /dev/null
@@ -1,236 +0,0 @@
-#! /bin/bash
-#
-# Basic tests for types creating/writing files
-#
-
-set -e
-set -x
-
-rm -fr /tmp/{f,F,w}
-mkdir  /tmp/{f,F,w}
-touch /tmp/file-owned-by-root
-
-#
-# 'f'
-#
-systemd-tmpfiles --create - <<EOF
-f     /tmp/f/1    0644 - - - -
-f     /tmp/f/2    0644 - - - This string should be written
-EOF
-
-### '1' should exist and be empty
-test -f /tmp/f/1; ! test -s /tmp/f/1
-test $(stat -c %U:%G:%a /tmp/f/1) = "root:root:644"
-
-test $(stat -c %U:%G:%a /tmp/f/2) = "root:root:644"
-test "$(< /tmp/f/2)" = "This string should be written"
-
-### The perms are supposed to be updated even if the file already exists.
-systemd-tmpfiles --create - <<EOF
-f     /tmp/f/1    0666 daemon daemon - This string should not be written
-EOF
-
-# file should be empty
-! test -s /tmp/f/1
-test $(stat -c %U:%G:%a /tmp/f/1) = "daemon:daemon:666"
-
-### But we shouldn't try to set perms on an existing file which is not a
-### regular one.
-mkfifo /tmp/f/fifo
-chmod 644 /tmp/f/fifo
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/f/fifo    0666 daemon daemon - This string should not be written
-EOF
-
-test -p /tmp/f/fifo
-test $(stat -c %U:%G:%a /tmp/f/fifo) = "root:root:644"
-
-### 'f' should not follow symlinks.
-ln -s missing /tmp/f/dangling
-ln -s /tmp/file-owned-by-root /tmp/f/symlink
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/f/dangling    0644 daemon daemon - -
-f     /tmp/f/symlink     0644 daemon daemon - -
-EOF
-! test -e /tmp/f/missing
-test $(stat -c %U:%G:%a /tmp/file-owned-by-root) = "root:root:644"
-
-### Handle read-only filesystem gracefully: we shouldn't fail if the target
-### already exists and have the correct perms.
-mkdir /tmp/f/rw-fs
-mkdir /tmp/f/ro-fs
-
-touch /tmp/f/rw-fs/foo
-chmod 644 /tmp/f/rw-fs/foo
-
-mount -o bind,ro /tmp/f/rw-fs /tmp/f/ro-fs
-
-systemd-tmpfiles --create - <<EOF
-f     /tmp/f/ro-fs/foo    0644 - - - - This string should not be written
-EOF
-test -f /tmp/f/ro-fs/foo; ! test -s /tmp/f/ro-fs/foo
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/f/ro-fs/foo    0666 - - - -
-EOF
-test $(stat -c %U:%G:%a /tmp/f/fifo) = "root:root:644"
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/f/ro-fs/bar    0644 - - - -
-EOF
-! test -e /tmp/f/ro-fs/bar
-
-### 'f' shouldn't follow unsafe paths.
-mkdir /tmp/f/daemon
-ln -s /root /tmp/f/daemon/unsafe-symlink
-chown -R --no-dereference daemon:daemon /tmp/f/daemon
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/f/daemon/unsafe-symlink/exploit    0644 daemon daemon - -
-EOF
-! test -e /tmp/f/daemon/unsafe-symlink/exploit
-
-#
-# 'F'
-#
-echo "This should be truncated" >/tmp/F/truncated
-echo "This should be truncated" >/tmp/F/truncated-with-content
-
-systemd-tmpfiles --create - <<EOF
-F     /tmp/F/created                0644 - - - -
-F     /tmp/F/created-with-content   0644 - - - new content
-F     /tmp/F/truncated              0666 daemon daemon - -
-F     /tmp/F/truncated-with-content 0666 daemon daemon - new content
-EOF
-
-test -f /tmp/F/created; ! test -s /tmp/F/created
-test -f /tmp/F/created-with-content
-test "$(< /tmp/F/created-with-content)" = "new content"
-test -f /tmp/F/truncated; ! test -s /tmp/F/truncated
-test $(stat -c %U:%G:%a /tmp/F/truncated) = "daemon:daemon:666"
-test -s /tmp/F/truncated-with-content
-test $(stat -c %U:%G:%a /tmp/F/truncated-with-content) = "daemon:daemon:666"
-
-### We shouldn't try to truncate anything but regular files since the behavior is
-### unspecified in the other cases.
-mkfifo /tmp/F/fifo
-
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/fifo                0644 - - - -
-EOF
-
-test -p /tmp/F/fifo
-
-### 'F' should not follow symlinks.
-ln -s missing /tmp/F/dangling
-ln -s /tmp/file-owned-by-root /tmp/F/symlink
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/F/dangling    0644 daemon daemon - -
-f     /tmp/F/symlink     0644 daemon daemon - -
-EOF
-! test -e /tmp/F/missing
-test $(stat -c %U:%G:%a /tmp/file-owned-by-root) = "root:root:644"
-
-### Handle read-only filesystem gracefully: we shouldn't fail if the target
-### already exists and is empty.
-mkdir /tmp/F/rw-fs
-mkdir /tmp/F/ro-fs
-
-touch /tmp/F/rw-fs/foo
-chmod 644 /tmp/F/rw-fs/foo
-
-mount -o bind,ro /tmp/F/rw-fs /tmp/F/ro-fs
-
-systemd-tmpfiles --create - <<EOF
-F     /tmp/F/ro-fs/foo    0644 - - - -
-EOF
-test -f /tmp/F/ro-fs/foo; ! test -s /tmp/F/ro-fs/foo
-
-echo "truncating is not allowed anymore" >/tmp/F/rw-fs/foo
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/ro-fs/foo    0644 - - - -
-EOF
-
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/ro-fs/foo    0644 - - - - This string should not be written
-EOF
-test -f /tmp/F/ro-fs/foo; ! test -s /tmp/F/ro-fs/foo
-
-# Trying to change the perms should fail.
->/tmp/F/rw-fs/foo
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/ro-fs/foo    0666 - - - -
-EOF
-test $(stat -c %U:%G:%a /tmp/F/ro-fs/foo) = "root:root:644"
-
-### Try to create a new file.
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/ro-fs/bar    0644 - - - -
-EOF
-! test -e /tmp/F/ro-fs/bar
-
-### 'F' shouldn't follow unsafe paths.
-mkdir /tmp/F/daemon
-ln -s /root /tmp/F/daemon/unsafe-symlink
-chown -R --no-dereference daemon:daemon /tmp/F/daemon
-
-! systemd-tmpfiles --create - <<EOF
-F     /tmp/F/daemon/unsafe-symlink/exploit    0644 daemon daemon - -
-EOF
-! test -e /tmp/F/daemon/unsafe-symlink/exploit
-
-#
-# 'w'
-#
-touch /tmp/w/overwritten
-
-### nop if the target does not exist.
-systemd-tmpfiles --create - <<EOF
-w     /tmp/w/unexistent    0644 - - - new content
-EOF
-! test -e /tmp/w/unexistent
-
-### no argument given -> fails.
-! systemd-tmpfiles --create - <<EOF
-w     /tmp/w/unexistent    0644 - - - -
-EOF
-
-### write into an empty file.
-systemd-tmpfiles --create - <<EOF
-w     /tmp/w/overwritten    0644 - - - old content
-EOF
-test -f /tmp/w/overwritten
-test "$(< /tmp/w/overwritten)" = "old content"
-
-### new content is overwritten
-systemd-tmpfiles --create - <<EOF
-w     /tmp/w/overwritten    0644 - - - new content
-EOF
-test -f /tmp/w/overwritten
-test "$(< /tmp/w/overwritten)" = "new content"
-
-### writing into an 'exotic' file should be allowed.
-systemd-tmpfiles --create - <<EOF
-w     /dev/null    - - - - new content
-EOF
-
-### 'w' follows symlinks
-ln -s ./overwritten /tmp/w/symlink
-systemd-tmpfiles --create - <<EOF
-w     /tmp/w/symlink    - - - - $(readlink -e /tmp/w/symlink)
-EOF
-readlink -e /tmp/w/symlink
-test "$(< /tmp/w/overwritten)" = "/tmp/w/overwritten"
-
-### 'w' shouldn't follow unsafe paths.
-mkdir /tmp/w/daemon
-ln -s /root /tmp/w/daemon/unsafe-symlink
-chown -R --no-dereference daemon:daemon /tmp/w/daemon
-
-! systemd-tmpfiles --create - <<EOF
-f     /tmp/w/daemon/unsafe-symlink/exploit    0644 daemon daemon - -
-EOF
-! test -e /tmp/w/daemon/unsafe-symlink/exploit
diff --git a/test/TEST-22-TMPFILES/test-04.sh b/test/TEST-22-TMPFILES/test-04.sh
deleted file mode 100755
index f916086b1e..0000000000
--- a/test/TEST-22-TMPFILES/test-04.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-#
-# Basic tests for types creating fifos
-#
-
-set -e
-set -x
-
-rm -fr /tmp/p
-mkdir  /tmp/p
-touch  /tmp/p/f1
-
-systemd-tmpfiles --create - <<EOF
-p     /tmp/p/fifo1    0666 - - - -
-EOF
-
-test -p /tmp/p/fifo1
-test $(stat -c %U:%G:%a /tmp/p/fifo1) = "root:root:666"
-
-# it should refuse to overwrite an existing file
-! systemd-tmpfiles --create - <<EOF
-p     /tmp/p/f1    0666 - - - -
-EOF
-
-test -f /tmp/p/f1
-
-# unless '+' prefix is used
-systemd-tmpfiles --create - <<EOF
-p+     /tmp/p/f1    0666 - - - -
-EOF
-
-test -p /tmp/p/f1
-test $(stat -c %U:%G:%a /tmp/p/f1) = "root:root:666"
-
-#
-# Must be fixed
-#
-# mkdir /tmp/p/daemon
-# #ln -s /root /tmp/F/daemon/unsafe-symlink
-# chown -R --no-dereference daemon:daemon /tmp/p/daemon
-#
-# systemd-tmpfiles --create - <<EOF
-# p      /tmp/p/daemon/fifo2    0666 daemon daemon - -
-# EOF
diff --git a/test/TEST-22-TMPFILES/test-05.sh b/test/TEST-22-TMPFILES/test-05.sh
deleted file mode 100755
index 13c4ac80fc..0000000000
--- a/test/TEST-22-TMPFILES/test-05.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/bash
-
-set -e
-set -x
-
-rm -fr /tmp/{z,Z}
-mkdir  /tmp/{z,Z}
-
-#
-# 'z'
-#
-mkdir /tmp/z/d{1,2}
-touch /tmp/z/f1 /tmp/z/d1/f11 /tmp/z/d2/f21
-
-systemd-tmpfiles --create - <<EOF
-z     /tmp/z/f1    0755 daemon daemon - -
-z     /tmp/z/d1    0755 daemon daemon - -
-EOF
-
-test $(stat -c %U:%G /tmp/z/f1) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/z/d1) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/z/d1/f11) = "root:root"
-
-systemd-tmpfiles --create - <<EOF
-z     /tmp/z/d2/*    0755 daemon daemon - -
-EOF
-
-test $(stat -c %U:%G /tmp/z/d2/f21) = "daemon:daemon"
-
-#
-# 'Z'
-#
-mkdir /tmp/Z/d1 /tmp/Z/d1/d11
-touch /tmp/Z/f1 /tmp/Z/d1/f11 /tmp/Z/d1/d11/f111
-
-systemd-tmpfiles --create - <<EOF
-Z     /tmp/Z/f1    0755 daemon daemon - -
-Z     /tmp/Z/d1    0755 daemon daemon - -
-EOF
-
-test $(stat -c %U:%G /tmp/Z/f1) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/Z/d1) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/Z/d1/d11) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/Z/d1/f11) = "daemon:daemon"
-test $(stat -c %U:%G /tmp/Z/d1/d11/f111) = "daemon:daemon"
diff --git a/test/TEST-22-TMPFILES/test-06.sh b/test/TEST-22-TMPFILES/test-06.sh
deleted file mode 100755
index cd65ba6726..0000000000
--- a/test/TEST-22-TMPFILES/test-06.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/bash
-#
-# Inspired by https://github.com/systemd/systemd/issues/9508
-#
-
-set -e
-
-test_snippet() {
-        systemd-tmpfiles "$@" - <<EOF
-d /var/tmp/foobar-test-06
-d /var/tmp/foobar-test-06/important
-R /var/tmp/foobar-test-06
-EOF
-}
-
-test_snippet --create --remove
-test -d /var/tmp/foobar-test-06
-test -d /var/tmp/foobar-test-06/important
-
-test_snippet --remove
-! test -f /var/tmp/foobar-test-06
-! test -f /var/tmp/foobar-test-06/important
-
-test_snippet --create
-test -d /var/tmp/foobar-test-06
-test -d /var/tmp/foobar-test-06/important
-
-touch /var/tmp/foobar-test-06/something-else
-
-test_snippet --create
-test -d /var/tmp/foobar-test-06
-test -d /var/tmp/foobar-test-06/important
-test -f /var/tmp/foobar-test-06/something-else
-
-test_snippet --create --remove
-test -d /var/tmp/foobar-test-06
-test -d /var/tmp/foobar-test-06/important
-! test -f /var/tmp/foobar-test-06/something-else
diff --git a/test/TEST-22-TMPFILES/test-07.sh b/test/TEST-22-TMPFILES/test-07.sh
deleted file mode 100755
index 39c04b925c..0000000000
--- a/test/TEST-22-TMPFILES/test-07.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-#
-# Verifies the issues described by https://github.com/systemd/systemd/issues/10191
-#
-
-set -e
-set -x
-
-rm -rf /tmp/test-prefix
-
-mkdir /tmp/test-prefix
-touch /tmp/test-prefix/file
-
-systemd-tmpfiles --remove - <<EOF
-r /tmp/test-prefix
-r /tmp/test-prefix/file
-EOF
-
-! test -f /tmp/test-prefix/file
-! test -f /tmp/test-prefix
-
-mkdir /tmp/test-prefix
-touch /tmp/test-prefix/file
-
-systemd-tmpfiles --remove - <<EOF
-r /tmp/test-prefix/file
-r /tmp/test-prefix
-EOF
-
-! test -f /tmp/test-prefix/file
-! test -f /tmp/test-prefix
diff --git a/test/TEST-22-TMPFILES/test-08.sh b/test/TEST-22-TMPFILES/test-08.sh
deleted file mode 100755
index e7bf044783..0000000000
--- a/test/TEST-22-TMPFILES/test-08.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/bash
-#
-# Verify tmpfiles can run in a root directory under a path prefix that contains
-# directories owned by unprivileged users, for example when a root file system
-# is mounted in a regular user's home directory.
-#
-# https://github.com/systemd/systemd/pull/11820
-#
-
-set -e
-
-rm -fr /tmp/root /tmp/user
-mkdir -p /tmp/root /tmp/user/root
-chown daemon:daemon /tmp/user
-
-# Verify the command works as expected with no prefix or a root-owned prefix.
-echo 'd /tmp/root/test1' | systemd-tmpfiles --create -
-test -d /tmp/root/test1
-echo 'd /test2' | systemd-tmpfiles --root=/tmp/root --create -
-test -d /tmp/root/test2
-
-# Verify the command fails to write to a root-owned subdirectory under an
-# unprivileged user's directory when it's not part of the prefix, as expected
-# by the unsafe_transition function.
-! echo 'd /tmp/user/root/test' | systemd-tmpfiles --create -
-! test -e /tmp/user/root/test
-! echo 'd /user/root/test' | systemd-tmpfiles --root=/tmp --create -
-! test -e /tmp/user/root/test
-
-# Verify the above works when all user-owned directories are in the prefix.
-echo 'd /test' | systemd-tmpfiles --root=/tmp/user/root --create -
-test -d /tmp/user/root/test
diff --git a/test/TEST-22-TMPFILES/test-09.sh b/test/TEST-22-TMPFILES/test-09.sh
deleted file mode 100755
index c558dfd4db..0000000000
--- a/test/TEST-22-TMPFILES/test-09.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -x
-
-# Make sure that the "stat" output is not locale dependent.
-export LANG=C LC_ALL=C
-
-# first, create file without suid/sgid
-systemd-tmpfiles --create - <<EOF
-f     /tmp/xxx    0755 1 1 - -
-f     /tmp/yyy    0755 1 1 - -
-EOF
-
-test "$(stat -c %F:%u:%g:%a /tmp/xxx)" = "regular empty file:1:1:755"
-test "$(stat -c %F:%u:%g:%a /tmp/yyy)" = "regular empty file:1:1:755"
-
-# then, add suid/sgid
-systemd-tmpfiles --create - <<EOF
-f     /tmp/xxx    04755
-f     /tmp/yyy    02755
-EOF
-
-test "$(stat -c %F:%u:%g:%a /tmp/xxx)" = "regular empty file:1:1:4755"
-test "$(stat -c %F:%u:%g:%a /tmp/yyy)" = "regular empty file:1:1:2755"
-
-# then, chown the files to somebody else
-systemd-tmpfiles --create - <<EOF
-f     /tmp/xxx    - 2 2
-f     /tmp/yyy    - 2 2
-EOF
-
-test "$(stat -c %F:%u:%g:%a /tmp/xxx)" = "regular empty file:2:2:4755"
-test "$(stat -c %F:%u:%g:%a /tmp/yyy)" = "regular empty file:2:2:2755"
-
-# then, chown the files to a third user/group but also drop to a mask that has
-# both more and fewer bits set
-systemd-tmpfiles --create - <<EOF
-f     /tmp/xxx    0770 3 3
-f     /tmp/yyy    0770 3 3
-EOF
-
-test "$(stat -c %F:%u:%g:%a /tmp/xxx)" = "regular empty file:3:3:770"
-test "$(stat -c %F:%u:%g:%a /tmp/yyy)" = "regular empty file:3:3:770"
-
-# return to the beginning
-systemd-tmpfiles --create - <<EOF
-f     /tmp/xxx    0755 1 1 - -
-f     /tmp/yyy    0755 1 1 - -
-EOF
-
-test "$(stat -c %F:%u:%g:%a /tmp/xxx)" = "regular empty file:1:1:755"
-test "$(stat -c %F:%u:%g:%a /tmp/yyy)" = "regular empty file:1:1:755"
-
-# remove everything
-systemd-tmpfiles --remove - <<EOF
-r /tmp/xxx
-r /tmp/yyy
-EOF
diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh
index aa6efcfb48..5ab688e4ac 100755
--- a/test/TEST-22-TMPFILES/test.sh
+++ b/test/TEST-22-TMPFILES/test.sh
@@ -9,23 +9,9 @@ test_setup() {
     # create the basic filesystem layout
     setup_basic_environment
     mask_supporting_services
-    inst_binary mv
-    inst_binary stat
-    inst_binary seq
-    inst_binary xargs
-    inst_binary mkfifo
-    inst_binary readlink
-
-    # setup the testsuite service
-    cp testsuite.service $initdir/etc/systemd/system/
-    setup_testsuite
-
-    mkdir -p $initdir/testsuite
-    cp run-tmpfiles-tests.sh $initdir/testsuite/
-    cp test-*.sh $initdir/testsuite/
 
     # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
     setup_nspawn_root
 }
 
-do_test "$@"
+do_test "$@" 22
diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/TEST-22-TMPFILES/testsuite.service
deleted file mode 100644
index 2f1b15c3ed..0000000000
--- a/test/TEST-22-TMPFILES/testsuite.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Testsuite service
-After=systemd-tmpfiles-setup.service
-Before=getty-pre.target
-Wants=getty-pre.target
-
-[Service]
-WorkingDirectory=/testsuite
-ExecStart=/testsuite/run-tmpfiles-tests.sh
-Type=oneshot
-StandardOutput=tty
-StandardError=tty