|
From: <sv...@va...> - 2012-06-23 10:15:31
|
bart 2012-06-23 11:15:17 +0100 (Sat, 23 Jun 2012)
New Revision: 12662
Log:
drd: Add yet another expected output file
Added files:
trunk/drd/tests/tc04_free_lock.stderr.exp-s390b
Copied files:
trunk/drd/tests/tc04_free_lock.stderr.exp-s390a
(from rev 12650, trunk/drd/tests/tc04_free_lock.stderr.exp-s390)
Removed files:
trunk/drd/tests/tc04_free_lock.stderr.exp-s390
Modified files:
trunk/drd/tests/Makefile.am
Deleted: trunk/drd/tests/tc04_free_lock.stderr.exp-s390 (+0 -28)
===================================================================
--- trunk/drd/tests/tc04_free_lock.stderr.exp-s390 2012-06-22 14:44:04 +01:00 (rev 12661)
+++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390 2012-06-23 11:15:17 +01:00 (rev 12662)
@@ -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)
Added: trunk/drd/tests/tc04_free_lock.stderr.exp-s390b (+26 -0)
===================================================================
--- trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-22 14:44:04 +01:00 (rev 12661)
+++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-23 11:15:17 +01:00 (rev 12662)
@@ -0,0 +1,26 @@
+
+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)
Copied: trunk/drd/tests/tc04_free_lock.stderr.exp-s390a (+0 -0)
===================================================================
Modified: trunk/drd/tests/Makefile.am (+2 -1)
===================================================================
--- trunk/drd/tests/Makefile.am 2012-06-22 14:44:04 +01:00 (rev 12661)
+++ trunk/drd/tests/Makefile.am 2012-06-23 11:15:17 +01:00 (rev 12662)
@@ -231,7 +231,8 @@
tc03_re_excl.vgtest \
tc04_free_lock.stderr.exp-x86 \
tc04_free_lock.stderr.exp-ppc \
- tc04_free_lock.stderr.exp-s390 \
+ tc04_free_lock.stderr.exp-s390a \
+ tc04_free_lock.stderr.exp-s390b \
tc04_free_lock.vgtest \
tc05_simple_race.stderr.exp \
tc05_simple_race.vgtest \
|
|
From: Florian K. <br...@ac...> - 2012-06-29 14:20:48
|
Hi Bart,
the new .exp file that you added differs from the old one like so:
--- tc04_free_lock.stderr.exp-s390a 2012-06-28 12:21:09.573612418 +0200
+++ tc04_free_lock.stderr.exp-s390b 2012-06-28 12:21:09.573612418 +0200
@@ -8,7 +8,6 @@
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 @@
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:?)
Wouldn't it be preferable to take care of this in the filter_stderr
script instead of adding another exp file? The extra line in the
back-trace comes from the dynamic loader and we're really not interested
to see those in testcases.
Florian
On 06/23/2012 12:15 PM, sv...@va... wrote:
> bart 2012-06-23 11:15:17 +0100 (Sat, 23 Jun 2012)
>
> New Revision: 12662
>
> Log:
> drd: Add yet another expected output file
>
> Added files:
> trunk/drd/tests/tc04_free_lock.stderr.exp-s390b
> Copied files:
> trunk/drd/tests/tc04_free_lock.stderr.exp-s390a
> (from rev 12650, trunk/drd/tests/tc04_free_lock.stderr.exp-s390)
> Removed files:
> trunk/drd/tests/tc04_free_lock.stderr.exp-s390
> Modified files:
> trunk/drd/tests/Makefile.am
>
>
> Deleted: trunk/drd/tests/tc04_free_lock.stderr.exp-s390 (+0 -28)
> ===================================================================
> --- trunk/drd/tests/tc04_free_lock.stderr.exp-s390 2012-06-22 14:44:04 +01:00 (rev 12661)
> +++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390 2012-06-23 11:15:17 +01:00 (rev 12662)
> @@ -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)
>
> Added: trunk/drd/tests/tc04_free_lock.stderr.exp-s390b (+26 -0)
> ===================================================================
> --- trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-22 14:44:04 +01:00 (rev 12661)
> +++ trunk/drd/tests/tc04_free_lock.stderr.exp-s390b 2012-06-23 11:15:17 +01:00 (rev 12662)
> @@ -0,0 +1,26 @@
> +
> +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)
>
> Copied: trunk/drd/tests/tc04_free_lock.stderr.exp-s390a (+0 -0)
> ===================================================================
>
> Modified: trunk/drd/tests/Makefile.am (+2 -1)
> ===================================================================
> --- trunk/drd/tests/Makefile.am 2012-06-22 14:44:04 +01:00 (rev 12661)
> +++ trunk/drd/tests/Makefile.am 2012-06-23 11:15:17 +01:00 (rev 12662)
> @@ -231,7 +231,8 @@
> tc03_re_excl.vgtest \
> tc04_free_lock.stderr.exp-x86 \
> tc04_free_lock.stderr.exp-ppc \
> - tc04_free_lock.stderr.exp-s390 \
> + tc04_free_lock.stderr.exp-s390a \
> + tc04_free_lock.stderr.exp-s390b \
> tc04_free_lock.vgtest \
> tc05_simple_race.stderr.exp \
> tc05_simple_race.vgtest \
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Valgrind-developers mailing list
> Val...@li...
> https://lists.sourceforge.net/lists/listinfo/valgrind-developers
>
|