Fixed failing tests

Makefile

@@ -4,6 +4,8 @@ all: systemd-user-sessions network-config
 	patch -Np1 -d systemd-245 < systemd-245-return_the_correct_wd_from_inotify_helpers.patch
 	patch -Np1 -d systemd-245 < systemd-245-gcc_10-fixes-2.patch
 	patch -Np1 -d systemd-245 < systemd-245-fix_timesyncd.patch
+	patch -Np1 -d systemd-245 < systemd-245-fix_test-execute_with_new_libcap.patch
+	patch -Np1 -d systemd-245 < systemd-245-fix_test-udev.patch
 	ln -s /tools/bin/true /usr/bin/xsltproc
 	cd systemd-245 && tar xf ../systemd-man-pages-245.tar.xz
 	cd systemd-245 && sed -i 's/GROUP="render", //' rules.d/50-udev-default.rules.in
@@ -26,11 +28,10 @@ all: systemd-user-sessions network-config
 	ln -sfv /lib/systemd/resolv.conf /etc/resolv.conf
 
 tests:
-	-if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
+	if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
 	    cd systemd-245/build ; \
 	    ninja test ; \
 	fi
-	-umount systemd-245/build/test/tmpfs
 	$(MAKE) -C .. success
 	rm -rf system-245
 

systemd-245-fix_test-execute_with_new_libcap.patch

+From e9cdcbed77971da3cb0b98b3eb91081142c91eb7 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Mon, 9 Mar 2020 11:00:58 +0100
+Subject: [PATCH] test: ignore IAB capabilities in `test-execute`
+
+libcap v2.33 introduces a new capability set called IAB[0] which is shown
+in the output of `capsh --print` and interferes with the test checks. Let's
+drop the IAB set from the output, for now, to mitigate this.
+
+This could be (and probably should be) replaced in the future by the
+newly introduced testing options[1][2] in libcap v2.32, namely:
+    --has-p=xxx
+    --has-i=xxx
+    --has-a=xxx
+
+but this needs to wait until the respective libcap version gets a wider
+adoption. Until then, let's stick with the relatively ugly sed.
+
+Fixes: #15046
+
+[0] https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=943b011b5e53624eb9cab4e96c1985326e077cdd
+[1] https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=588d0439cb6495b03f0ab9f213f0b6b339e7d4b7
+[2] https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=e7709bbc1c4712f2ddfc6e6f42892928a8a03782
+---
+ test/test-execute/exec-capabilityboundingset-invert.service   | 4 ++--
+ .../exec-privatedevices-no-capability-mknod.service           | 4 ++--
+ .../exec-privatedevices-no-capability-sys-rawio.service       | 4 ++--
+ .../exec-privatedevices-yes-capability-mknod.service          | 4 ++--
+ .../exec-privatedevices-yes-capability-sys-rawio.service      | 4 ++--
+ .../exec-protectkernellogs-no-capabilities.service            | 4 ++--
+ .../exec-protectkernellogs-yes-capabilities.service           | 4 ++--
+ .../exec-protectkernelmodules-no-capabilities.service         | 4 ++--
+ .../exec-protectkernelmodules-yes-capabilities.service        | 4 ++--
+ 9 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/test/test-execute/exec-capabilityboundingset-invert.service b/test/test-execute/exec-capabilityboundingset-invert.service
+index 5f374276034d..4486f6c25d87 100644
+--- a/test/test-execute/exec-capabilityboundingset-invert.service
++++ b/test/test-execute/exec-capabilityboundingset-invert.service
+@@ -2,7 +2,7 @@
+ Description=Test for CapabilityBoundingSet
+ 
+ [Service]
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep "^Bounding set .*cap_chown"'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c '! capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep "^Bounding set .*cap_chown"'
+ Type=oneshot
+ CapabilityBoundingSet=~CAP_CHOWN
+diff --git a/test/test-execute/exec-privatedevices-no-capability-mknod.service b/test/test-execute/exec-privatedevices-no-capability-mknod.service
+index 4d61d9ffaa9b..8f135be0b5e9 100644
+--- a/test/test-execute/exec-privatedevices-no-capability-mknod.service
++++ b/test/test-execute/exec-privatedevices-no-capability-mknod.service
+@@ -3,6 +3,6 @@ Description=Test CAP_MKNOD capability for PrivateDevices=no
+ 
+ [Service]
+ PrivateDevices=no
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_mknod'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c 'capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_mknod'
+ Type=oneshot
+diff --git a/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service b/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
+index f7f7a16736d9..30ce5492546f 100644
+--- a/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
++++ b/test/test-execute/exec-privatedevices-no-capability-sys-rawio.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYS_RAWIO capability for PrivateDevices=no
+ 
+ [Service]
+ PrivateDevices=no
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_rawio'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c 'capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_sys_rawio'
+ Type=oneshot
+diff --git a/test/test-execute/exec-privatedevices-yes-capability-mknod.service b/test/test-execute/exec-privatedevices-yes-capability-mknod.service
+index 5bcace08455b..b98cfb5c7eac 100644
+--- a/test/test-execute/exec-privatedevices-yes-capability-mknod.service
++++ b/test/test-execute/exec-privatedevices-yes-capability-mknod.service
+@@ -3,6 +3,6 @@ Description=Test CAP_MKNOD capability for PrivateDevices=yes
+ 
+ [Service]
+ PrivateDevices=yes
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_mknod'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c '! capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_mknod'
+ Type=oneshot
+diff --git a/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service b/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
+index a246f950c116..5b0c0700f2c8 100644
+--- a/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
++++ b/test/test-execute/exec-privatedevices-yes-capability-sys-rawio.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYS_RAWIO capability for PrivateDevices=yes
+ 
+ [Service]
+ PrivateDevices=yes
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_rawio'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c '! capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_sys_rawio'
+ Type=oneshot
+diff --git a/test/test-execute/exec-protectkernellogs-no-capabilities.service b/test/test-execute/exec-protectkernellogs-no-capabilities.service
+index 47d88534a9b8..36aae7caf1a4 100644
+--- a/test/test-execute/exec-protectkernellogs-no-capabilities.service
++++ b/test/test-execute/exec-protectkernellogs-no-capabilities.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYSLOG for ProtectKernelLogs=no
+ 
+ [Service]
+ ProtectKernelLogs=no
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_syslog'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c 'capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_syslog'
+ Type=oneshot
+diff --git a/test/test-execute/exec-protectkernellogs-yes-capabilities.service b/test/test-execute/exec-protectkernellogs-yes-capabilities.service
+index 11350f288a57..4a5f1a08e902 100644
+--- a/test/test-execute/exec-protectkernellogs-yes-capabilities.service
++++ b/test/test-execute/exec-protectkernellogs-yes-capabilities.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYSLOG for ProtectKernelLogs=yes
+ 
+ [Service]
+ ProtectKernelLogs=yes
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_syslog'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c '! capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_syslog'
+ Type=oneshot
+diff --git a/test/test-execute/exec-protectkernelmodules-no-capabilities.service b/test/test-execute/exec-protectkernelmodules-no-capabilities.service
+index 8d7e2b52d444..1b73656305e4 100644
+--- a/test/test-execute/exec-protectkernelmodules-no-capabilities.service
++++ b/test/test-execute/exec-protectkernelmodules-no-capabilities.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYS_MODULE ProtectKernelModules=no
+ 
+ [Service]
+ ProtectKernelModules=no
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c 'capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_module'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c 'capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_sys_module'
+ Type=oneshot
+diff --git a/test/test-execute/exec-protectkernelmodules-yes-capabilities.service b/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
+index fe2ae208dd20..e43e72733c93 100644
+--- a/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
++++ b/test/test-execute/exec-protectkernelmodules-yes-capabilities.service
+@@ -3,6 +3,6 @@ Description=Test CAP_SYS_MODULE for ProtectKernelModules=yes
+ 
+ [Service]
+ ProtectKernelModules=yes
+-# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
+-ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_module'
++# sed: remove dropped (cap_xxx-[epi]) and IAB capabilities from the output
++ExecStart=/bin/sh -x -c '! capsh --print | sed -re "s/[^ ]+?\-[epi]+//g" -e '/IAB/d' | grep cap_sys_module'
+ Type=oneshot

systemd-245-fix_test-udev.patch

+diff -uNr systemd-245/test/udev-test.pl systemd-245-fix_test-udev/test/udev-test.pl
+--- systemd-245/test/udev-test.pl	2020-03-06 23:08:52.000000000 +1030
++++ systemd-245-fix_test-udev/test/udev-test.pl	2022-04-11 09:52:21.302283539 +0930
+@@ -998,7 +998,7 @@
+                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                 exp_name        => "node",
+                 rules           => <<EOF
+-SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" SYMLINK+="node"
++SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/test -b %N" SYMLINK+="node"
+ EOF
+         },
+         {