From e479ebc7fa189561bd1459aa60d1374bf67a6746 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Tue, 11 Mar 2025 09:10:42 +0100 Subject: [PATCH] Regtest: filter out pathname from memcheck dw4 test --- memcheck/tests/dw4.stderr.exp | 4 ++-- memcheck/tests/filter_dw4.in | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/memcheck/tests/dw4.stderr.exp b/memcheck/tests/dw4.stderr.exp index e4b523f98..02c595511 100644 --- a/memcheck/tests/dw4.stderr.exp +++ b/memcheck/tests/dw4.stderr.exp @@ -35,12 +35,12 @@ Unaddressable byte(s) found during client check request Uninitialised byte(s) found during client check request at 0x........: croak (dw4.c:32) by 0x........: main (dw4.c:89) - Address 0x........ is in a rw- mapped file /export/home/paulf/valgrind/memcheck/tests/dw4 segment + Address 0x........ is in a rw- mapped file DIRECTORY/dw4 segment Uninitialised byte(s) found during client check request at 0x........: croak (dw4.c:32) by 0x........: main (dw4.c:91) - Address 0x........ is in a rw- mapped file /export/home/paulf/valgrind/memcheck/tests/dw4 segment + Address 0x........ is in a rw- mapped file DIRECTORY/dw4 segment Unaddressable byte(s) found during client check request at 0x........: croak (dw4.c:25) diff --git a/memcheck/tests/filter_dw4.in b/memcheck/tests/filter_dw4.in index 96b6ab8f5..d729ad6e8 100755 --- a/memcheck/tests/filter_dw4.in +++ b/memcheck/tests/filter_dw4.in @@ -9,6 +9,9 @@ $SED "s/inside a block of size [0-9]* alloc'd/inside a block of size ... alloc'd # remove directory name and pid from mapped filename $SED "s/file .*valgrind-dw4-test.[1-9][0-9]*/file valgrind-dw4-test.PID/" | +# remove name from mapped file segment +$SED "s#is in a rw- mapped file .*/dw4 segment#is in a rw- mapped file DIRECTORY/dw4 segment#" | + ./filter_stderr "$@" exit 0 -- 2.47.2