From 1a2d5e0c03f3e51a2d71bd5d2e6b35d9dce61418 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 3 Jul 2012 07:53:34 +0000 Subject: [PATCH] drd/tests: Make the expected output match the actual output git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12702 --- drd/tests/filter_stderr | 2 +- drd/tests/tc04_free_lock.stderr.exp-s390 | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr index 70ffae0c00..2376e17e3f 100755 --- a/drd/tests/filter_stderr +++ b/drd/tests/filter_stderr @@ -32,7 +32,7 @@ sed \ -e "s/ (\([a-zA-Z_]*\.h\):[0-9]*)/ (\1:?)/" \ -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" \ -e "s/\( name [^ ]*\)-[0-9]*\( oflag \)/\1\2/" \ --e '/^ by 0x[0-9a-fA-F.]*: process_dl_debug \(in \/lib.*\/ld-[0-9.]*\.so\)$/d' \ +-e '/^ by 0x[0-9a-fA-F]*: process_dl_debug \(in \/lib.*\/ld-[0-9.]*\.so\)$/d' \ -e "/^For counts of detected and suppressed errors, rerun with: -v$/d" | # Remove the message that more than hundred errors have been detected diff --git a/drd/tests/tc04_free_lock.stderr.exp-s390 b/drd/tests/tc04_free_lock.stderr.exp-s390 index eafb3db177..041ae3cc3d 100644 --- a/drd/tests/tc04_free_lock.stderr.exp-s390 +++ b/drd/tests/tc04_free_lock.stderr.exp-s390 @@ -8,7 +8,6 @@ mutex 0x........ was first observed at: Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. at 0x........: bar (tc04_free_lock.c:40) - by 0x........: process_dl_debug (in /lib64/ld-2.3.4.so) by 0x........: ??? mutex 0x........ was first observed at: at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) @@ -17,7 +16,6 @@ mutex 0x........ was first observed at: Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. at 0x........: foo (tc04_free_lock.c:49) - by 0x........: process_dl_debug (in /lib64/ld-2.3.4.so) by 0x........: ??? mutex 0x........ was first observed at: at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) -- 2.47.2