From e0852d21ddbd5352d6e23281a936f6bb318b10f6 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 30 Jul 2024 10:34:41 +0200 Subject: [PATCH] tests: workaround valgrind SIGPIPE Parsing --debug output with quiet flag can produce SIGPIPE output if running with valgrind wrapper, just workaround it with another grep as used elsewhere. --- tests/compat-test2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/compat-test2 b/tests/compat-test2 index 63adcea9..cc38665a 100755 --- a/tests/compat-test2 +++ b/tests/compat-test2 @@ -1622,7 +1622,7 @@ prepare "[46] Blkid disable check" wipe if [ "$HAVE_BLKID" -gt 0 ]; then xz -dkf $HEADER_LUKS2_PV.xz # batch mode disables blkid print, use --debug to check it - echo $PWD1 | $CRYPTSETUP -q --debug luksFormat $FAST_PBKDF_OPT --type luks2 $HEADER_LUKS2_PV 2>&1 | grep -q "LVM2_member" || fail + echo $PWD1 | $CRYPTSETUP -q --debug luksFormat $FAST_PBKDF_OPT --type luks2 $HEADER_LUKS2_PV 2>&1 | grep "signature" | grep -q "LVM2_member" || fail xz -dkf $HEADER_LUKS2_PV.xz echo $PWD1 | $CRYPTSETUP -q --debug --disable-blkid luksFormat $FAST_PBKDF_OPT --type luks2 $HEADER_LUKS2_PV 2>&1 | grep -q "LVM2_member" && fail fi