File 0001-TEST-37-RUNTIMEDIRECTORYPRESERVE-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 2c25ce62efc2d9e1cdd28a4872388330f7d328ba Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 17:57:55 +0200
Subject: [PATCH] TEST-37-RUNTIMEDIRECTORYPRESERVE: adapt for openQA

---
 test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh | 30 +++++++++++++++++++
 .../testsuite.sh                              |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
index 2c5ad430b5..c9a219ab04 100755
--- a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
@@ -4,6 +4,7 @@
 set -e
 TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -26,10 +27,39 @@ ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
 EOF
         cp testsuite.sh $initdir/
+        cp testsuite.sh /
+        cp $initdir/etc/systemd/system/testsuite.service /etc/systemd/system/
 
         setup_testsuite
     ) || return 1
     setup_nspawn_root
 }
 
+test_run() {
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    if [ -z "$TEST_NO_NSPAWN" ]; then
+        if run_nspawn "nspawn-root"; then
+            check_result_nspawn "nspawn-root" || return 1
+        else
+            dwarn "can't run systemd-nspawn, skipping"
+        fi
+    fi
+    ret=1
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
+
+test_cleanup() {
+    _test_cleanup
+    rm -f /etc/systemd/system/testsuite.service
+    rm -f /testsuite.sh
+    rm -rf /run/hoge
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh
index 32a9dd8694..0951a809c3 100755
--- a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh
@@ -14,6 +14,6 @@ systemctl restart tmp-aaa.mount
 test -e /run/hoge/foo
 ! test -e /tmp/aaa/bbb
 
-echo OK > /testok
+echo SUSE testOK > /testok
 
 exit 0
-- 
2.26.2