|
From: <sv...@va...> - 2012-06-30 18:00:23
|
bart 2012-06-30 19:00:08 +0100 (Sat, 30 Jun 2012)
New Revision: 12690
Log:
drd/tests: Rework r12662 as suggested by Florian Krohm
Copied files:
trunk/drd/tests/tc04_free_lock.stderr.exp-s390
(from rev 12661, trunk/drd/tests/tc04_free_lock.stderr.exp-s390)
Removed files:
trunk/drd/tests/tc04_free_lock.stderr.exp-s390a
trunk/drd/tests/tc04_free_lock.stderr.exp-s390b
Modified files:
trunk/drd/tests/Makefile.am
trunk/drd/tests/filter_stderr
Modified: trunk/drd/tests/filter_stderr (+1 -0)
===================================================================
--- trunk/drd/tests/filter_stderr 2012-06-30 17:51:00 +01:00 (rev 12689)
+++ trunk/drd/tests/filter_stderr 2012-06-30 19:00:08 +01:00 (rev 12690)
@@ -32,6 +32,7 @@
-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
Modified: trunk/drd/tests/Makefile.am (+1 -2)
===================================================================
--- trunk/drd/tests/Makefile.am 2012-06-30 17:51:00 +01:00 (rev 12689)
+++ trunk/drd/tests/Makefile.am 2012-06-30 19:00:08 +01:00 (rev 12690)
@@ -231,8 +231,7 @@
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 \
Copied: trunk/drd/tests/tc04_free_lock.stderr.exp-s390 (+0 -0)
===================================================================
Deleted: trunk/drd/tests/tc04_free_lock.stderr.exp-s390b (+0 -26)
===================================================================
--- trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-30 17:51:00 +01:00 (rev 12689)
+++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-30 19:00:08 +01:00 (rev 12690)
@@ -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)
Deleted: trunk/drd/tests/tc04_free_lock.stderr.exp-s390a (+0 -28)
===================================================================
--- trunk/drd/tests/tc04_free_lock.stderr.exp-s390a 2012-06-30 17:51:00 +01:00 (rev 12689)
+++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390a 2012-06-30 19:00:08 +01:00 (rev 12690)
@@ -1,28 +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........: 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:?)
- 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........: 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:?)
- 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)
|