From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 29 Oct 2024 17:35:50 +0000 (+0100)
Subject: TEST-80-NOTIFYACCESS: don't specify --pid= if MAINPID= is provided explicitly
X-Git-Tag: v256.8~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2496d151ae093974e6ecd3a6b3299e1ba5f3e23;p=thirdparty%2Fsystemd.git

TEST-80-NOTIFYACCESS: don't specify --pid= if MAINPID= is provided explicitly

Otherwise, with recent additions, the MAINPIDFDID= generated by
systemd-notify would mismatch with overridden MAINPID=.

(cherry picked from commit c3ecb747f1e35f609f15fc94ad4d5e5ca0bda4a2)
---

diff --git a/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh
index 565ed8d35ac..a0e233946eb 100755
--- a/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh
+++ b/test/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units/test.sh
@@ -39,7 +39,7 @@ sync_in b
     sync_in d
 
     # Move main process back to toplevel
-    systemd-notify --pid=parent "MAINPID=$$"
+    systemd-notify "MAINPID=$$"
 
     # Should be dropped again
     systemd-notify --status="BOGUS2" --pid=parent