|
From: <sv...@va...> - 2011-10-22 16:33:55
|
Author: bart
Date: 2011-10-22 17:29:11 +0100 (Sat, 22 Oct 2011)
New Revision: 12200
Log:
Add a custom filter for the drd/tests/annotate_barrier_xml regression test
Added:
trunk/drd/tests/filter_annotate_barrier_xml
Modified:
trunk/drd/tests/Makefile.am
trunk/drd/tests/annotate_barrier_xml.stderr.exp
trunk/drd/tests/annotate_barrier_xml.vgtest
Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am 2011-10-22 15:04:05 UTC (rev 12199)
+++ trunk/drd/tests/Makefile.am 2011-10-22 16:29:11 UTC (rev 12200)
@@ -3,6 +3,7 @@
dist_noinst_SCRIPTS = \
compare_error_count_with \
+ filter_annotate_barrier_xml \
filter_error_count \
filter_error_summary \
filter_stderr \
Modified: trunk/drd/tests/annotate_barrier_xml.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_barrier_xml.stderr.exp 2011-10-22 15:04:05 UTC (rev 12199)
+++ trunk/drd/tests/annotate_barrier_xml.stderr.exp 2011-10-22 16:29:11 UTC (rev 12200)
@@ -189,9 +189,6 @@
<ip>0x........</ip>
<obj>...</obj>
<fn>start_thread</fn>
- <dir>...</dir>
- <file>pthread_create.c</file>
- <line>...</line>
</frame>
</stack>
<auxwhat>Address 0x........ is at offset 0 from 0x.........</auxwhat>
Modified: trunk/drd/tests/annotate_barrier_xml.vgtest
===================================================================
--- trunk/drd/tests/annotate_barrier_xml.vgtest 2011-10-22 15:04:05 UTC (rev 12199)
+++ trunk/drd/tests/annotate_barrier_xml.vgtest 2011-10-22 16:29:11 UTC (rev 12200)
@@ -1,4 +1,4 @@
prereq: test -e annotate_barrier && ./supported_libpthread
vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no --num-callers=3 --xml=yes --xml-fd=2
prog: annotate_barrier 2 1 1
-stderr_filter: ../../memcheck/tests/filter_xml
+stderr_filter: filter_annotate_barrier_xml
Added: trunk/drd/tests/filter_annotate_barrier_xml
===================================================================
--- trunk/drd/tests/filter_annotate_barrier_xml (rev 0)
+++ trunk/drd/tests/filter_annotate_barrier_xml 2011-10-22 16:29:11 UTC (rev 12200)
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Remove the three lines after "<fn>start_thread</fn>" if these start with
+# "<dir>...</dir>" since these last three lines are not generated on all
+# platforms.
+../../memcheck/tests/filter_xml |
+awk '{
+ if ($0 == " <fn>start_thread</fn>") {
+ line1 = $0
+ getline
+ if ($0 == " <dir>...</dir>") {
+ line2 = $0
+ getline
+ if ($0 == " <file>pthread_create.c</file>") {
+ line3 = $0
+ getline
+ if ($0 == " <line>...</line>") {
+ $0 = line1
+ } else {
+ print line1
+ print line2
+ print line3
+ }
+ } else {
+ print line1
+ print line2
+ }
+ } else {
+ print line1
+ }
+ }
+ print
+ }'
Property changes on: trunk/drd/tests/filter_annotate_barrier_xml
___________________________________________________________________
Name: svn:executable
+ *
|