From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 30 May 2023 20:53:43 +0000 (+0200)
Subject: test-fstab-generator: fix test on systemd with systemd-boot
X-Git-Tag: v254-rc1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=088d8c99fe98e00eefdb8263cc9ce218a8023718;p=thirdparty%2Fsystemd.git

test-fstab-generator: fix test on systemd with systemd-boot

(… or other boot loaders implementing the Boot Loader Interface.)

Fixes #27857.
---

diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh
index 68c9d0631e2..c390c785c98 100755
--- a/test/test-fstab-generator.sh
+++ b/test/test-fstab-generator.sh
@@ -19,6 +19,10 @@ src="$(dirname "$0")/testdata/test-fstab-generator"
 # fsck(8) is located in /usr/sbin on Debian
 PATH=$PATH:/usr/sbin
 
+# systemd-pcrfs@.service could be enabled or not, depending on the host state
+# of the host system. Override the measurement to avoid the issue.
+export SYSTEMD_FORCE_MEASURE=0
+
 for f in "$src"/test-*.input; do
     echo "*** Running $f"