drd/tests: Rework r12662 as suggested by Florian Krohm

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12690

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 7808ce4ab742365561fff2600c49872d12a53bde..e7f1f3aa023ec59b6a3bf3e289d1d67c05262b6c 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -231,8 +231,7 @@ EXTRA_DIST =                                        \
        tc03_re_excl.vgtest                         \
        tc04_free_lock.stderr.exp-x86               \
        tc04_free_lock.stderr.exp-ppc               \
-       tc04_free_lock.stderr.exp-s390a             \
-       tc04_free_lock.stderr.exp-s390b             \
+       tc04_free_lock.stderr.exp-s390              \
        tc04_free_lock.vgtest                       \
        tc05_simple_race.stderr.exp                 \
        tc05_simple_race.vgtest                     \

diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr
index 4e8294051bd7b1fe4ea72dbb75859589f902f0d4..2376e17e3f3c85025d649ae7b80b28a49188edfd 100755 (executable)
--- a/drd/tests/filter_stderr
+++ b/drd/tests/filter_stderr
@@ -32,6 +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 "/^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-s390a b/drd/tests/tc04_free_lock.stderr.exp-s390
similarity index 100%
rename from drd/tests/tc04_free_lock.stderr.exp-s390a
rename to drd/tests/tc04_free_lock.stderr.exp-s390

diff --git a/drd/tests/tc04_free_lock.stderr.exp-s390b b/drd/tests/tc04_free_lock.stderr.exp-s390b
deleted file mode 100644 (file)
index 041ae3c..0000000
--- a/drd/tests/tc04_free_lock.stderr.exp-s390b
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: free (vg_replace_malloc.c:...)
-   by 0x........: main (tc04_free_lock.c:24)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc04_free_lock.c:20)
-
-Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: bar (tc04_free_lock.c:40)
-   by 0x........: ???
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: bar (tc04_free_lock.c:38)
-   by 0x........: main (tc04_free_lock.c:26)
-
-Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: foo (tc04_free_lock.c:49)
-   by 0x........: ???
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: foo (tc04_free_lock.c:46)
-   by 0x........: main (tc04_free_lock.c:27)
-
-
-ERROR SUMMARY: 4 errors from 3 contexts (suppressed: 0 from 0)