File 0025-TEST-22-TMPFILES-remove-qemu-from-testrun.patch of Package systemd-v234-testsuite

From 5fe9d65afc7f148c3404c52641869200b6a8efe5 Mon Sep 17 00:00:00 2001
From: Thomas Blume <thomas.blume@suse.com>
Date: Tue, 9 Apr 2019 12:58:39 +0200
Subject: [PATCH] TEST-22-TMPFILES: remove qemu from testrun

---
 test/TEST-22-TMPFILES/test.sh           | 35 +++++++++++++++++++++++++++++----
 test/TEST-22-TMPFILES/testsuite.service |  1 +
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh
index 13e191bd92..dc9218d334 100755
--- a/test/TEST-22-TMPFILES/test.sh
+++ b/test/TEST-22-TMPFILES/test.sh
@@ -6,8 +6,25 @@ TEST_DESCRIPTION="Tmpfiles related tests"
 TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
+. $TEST_BASE_DIR/test-functions
+
+test_run() {
+    ret=1
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    systemctl status --full testsuite.service
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
 
 test_setup() {
+    mkdir -p $TESTDIR/root
+    initdir=$TESTDIR/root
+    STRIP_BINARIES=no
+
+    LOG_LEVEL=5
+
     # create the basic filesystem layout
     setup_basic_environment
     inst_binary mv
@@ -26,15 +43,25 @@ test_setup() {
     ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
 
     # setup the testsuite service
-    cp testsuite.service $initdir/etc/systemd/system/
+    cp testsuite.service /etc/systemd/system/
     setup_testsuite
 
-    mkdir -p $initdir/testsuite
-    cp run-tmpfiles-tests.sh $initdir/testsuite/
-    cp test-*.sh $initdir/testsuite/
+    mkdir -p /testsuite
+    cp run-tmpfiles-tests.sh /testsuite/
+    cp test-*.sh /testsuite/
 
     # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
     setup_nspawn_root
 }
 
+test_cleanup() {
+    for service in testsuite.service; do
+         rm /etc/systemd/system/$service
+    done
+    rm -r /testsuite
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
+ }
+
 do_test "$@"
diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/TEST-22-TMPFILES/testsuite.service
index 123b12790f..0326ba21ea 100644
--- a/test/TEST-22-TMPFILES/testsuite.service
+++ b/test/TEST-22-TMPFILES/testsuite.service
@@ -5,6 +5,7 @@ After=multi-user.target
 [Service]
 WorkingDirectory=/testsuite
 ExecStart=/testsuite/run-tmpfiles-tests.sh
+ExecStartPost=/bin/sh -x -c 'echo -e "\nfailed:" > /failed; systemctl --state=failed --no-pager >> /failed; echo -e "\ntestresult:\nOK" > /testok'
 Type=oneshot
 StandardOutput=tty
 StandardError=tty
-- 
2.16.4