File 0008-TEST-07-ISSUE-1981-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite
From 9eaf6740d0399c2f804d2592aaa8d6dfc05c6b50 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:49:34 +0100
Subject: [PATCH 08/24] TEST-07-ISSUE-1981: adapt for SUSE openQA
---
test/TEST-07-ISSUE-1981/test-segfault.sh | 2 +-
test/TEST-07-ISSUE-1981/test.sh | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/TEST-07-ISSUE-1981/test-segfault.sh b/test/TEST-07-ISSUE-1981/test-segfault.sh
index 82339c23cd..c7855e6263 100755
--- a/test/TEST-07-ISSUE-1981/test-segfault.sh
+++ b/test/TEST-07-ISSUE-1981/test-segfault.sh
@@ -31,5 +31,5 @@ systemctl daemon-reload
systemctl mask my.timer
-touch /testok
+echo SUSEtest OK > /testok
rm /failed
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh
index e72c11fd1b..ed46e2c3a3 100755
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@@ -3,6 +3,7 @@ set -e
TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/1981"
TEST_NO_QEMU=1
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
. $TEST_BASE_DIR/test-functions
NSPAWN_TIMEOUT=30
@@ -16,9 +17,10 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
- mask_supporting_services
+ mask_supporting_services_nspawn
# setup the testsuite service
+ echo "testservice=$initdir/etc/systemd/system/testsuite.service"
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
[Unit]
Description=Testsuite service
--
2.16.4