[Valgrind-developers] [valgrind] Bug 493959 - s390x: Fix regtest failure for op00 with /bin/dash

[Andreas A. <ar...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=74d85edfbdcac7c5c9cbbb2460005d5c4dac4447

commit 74d85edfbdcac7c5c9cbbb2460005d5c4dac4447
Author: Florian Krohm <fl...@ei...>
Date:   Tue Oct 29 16:24:31 2024 +0100

    Bug 493959 - s390x: Fix regtest failure for op00 with /bin/dash
    
    On different machines /bin/sh may be impersonated by different shells, and
    those behave differently as to whether they write "Illegal instruction ..."
    to stderr.  While newer versions of bash do not, dash does.
    
    For the op00 test case this means that an additional line may be written
    to `op00.stderr.out', depending on which shell is being used.  Hence
    adding "Illegal instruction ..." as an expected line to `op00.stderr.exp'
    wouldn't work on all systems.
    
    Instead, fix this issue by adding the case of "illegal instruction" to the
    general filtering logic in filter_stderr_basic.in, where various other
    messages of this kind are already filtered out.
    
    Reviewed-by: Andreas Arnez <ar...@li...>

Diff:
---
 NEWS                         | 1 +
 tests/filter_stderr_basic.in | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 8fb685ffaa..329bcdb654 100644
--- a/NEWS
+++ b/NEWS
@@ -79,6 +79,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 493454  Missing FUSE_COMPATIBLE_MAY_BLOCK markers
 493507  direct readlink syscall from PRE handler is incompatible with
         FUSE_COMPATIBLE_MAY_BLOCK
+493959  s390x: Fix regtest failure for none/tests/s390x/op00
 493970  s390x: Store/restore FPC upon helper call causes slowdown
 494252  s390x: incorrect disassembly for LOCHI and friends
 495278  PowerPC instruction dcbf should allow the L field values of 4, 6 on
diff --git a/tests/filter_stderr_basic.in b/tests/filter_stderr_basic.in
index 6f7dec1d3d..f32266c0b7 100755
--- a/tests/filter_stderr_basic.in
+++ b/tests/filter_stderr_basic.in
@@ -49,11 +49,10 @@ $SED "/warning: line info addresses out of order/d" |
 $SED "/main Warning: due to transparent memory mappings with MAP_STACK/d" |
 $SED "/main --sanity-level=3 and above may give spurious errors./d" |
 
-# Older bash versions print abnormal termination messages on the stderr
-# of the bash process. Newer bash versions redirect such messages properly.
-# Suppress any redirected abnormal termination messages. You can find the
-# complete list of messages in the bash source file siglist.c.
-perl -n -e 'print if !/^(Segmentation fault|Alarm clock|Aborted|Bus error|Killed)( \(core dumped\))?$/' |
+# Filter out abnormal termination messages. Depending on which shell is
+# pointed to by /bin/sh those messages will be written to stderr or not.
+# E.g. dash writes them to stderr, whereas bash does not.
+perl -n -e 'print if !/^(Illegal instruction|Segmentation fault|Alarm clock|Aborted|Bus error|Killed)( \(core dumped\))?$/' |
 
 # Similar as above, but for ksh on Solaris/illumos.
 perl -n -e 'print if !/^(Memory fault|Killed) $/' |