You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1.2 KiB
29 lines
1.2 KiB
6 months ago
|
From 02db660b590df6e281468ff078904a83c6d52f8c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||
|
|
Date: Thu, 25 Jan 2024 12:33:29 +0100
|
||
|
|
Subject: [PATCH] test: merge TEST-20-MAINPIDGAMES into TEST-07-PID1 (fixup)
|
||
|
|
|
||
|
|
Forgotten snippet from the original commit, complements commit
|
||
|
|
77827462f17ba6de2c56c7e242d1468f9c112cb3.
|
||
|
|
|
||
|
|
(cherry picked from commit 3a4b86264eef6bd51e880386388e8b3f95cbaa33)
|
||
|
|
|
||
|
|
Related: RHEL-1086
|
||
|
|
---
|
||
|
|
test/units/testsuite-07.main-PID-change.sh | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/test/units/testsuite-07.main-PID-change.sh b/test/units/testsuite-07.main-PID-change.sh
|
||
|
|
index be4631f10d..bd5a63a272 100755
|
||
|
|
--- a/test/units/testsuite-07.main-PID-change.sh
|
||
|
|
+++ b/test/units/testsuite-07.main-PID-change.sh
|
||
|
|
@@ -151,6 +151,8 @@ systemd-run --unit=test-mainpidsh3.service \
|
||
|
|
-p RuntimeDirectory=mainpidsh3 \
|
||
|
|
-p PIDFile=/run/mainpidsh3/pid \
|
||
|
|
-p DynamicUser=1 \
|
||
|
|
+ `# Make sanitizers happy when DynamicUser=1 pulls in instrumented systemd NSS modules` \
|
||
|
|
+ -p EnvironmentFile=-/usr/lib/systemd/systemd-asan-env \
|
||
|
|
-p TimeoutStartSec=2s \
|
||
|
|
/dev/shm/test-mainpid3.sh \
|
||
|
|
&& { echo 'unexpected success'; exit 1; }
|