|
From: <sv...@va...> - 2009-07-24 04:47:19
|
Author: njn
Date: 2009-07-24 05:47:04 +0100 (Fri, 24 Jul 2009)
New Revision: 10572
Log:
Add Valgrind version back into the preamble.
Modified:
trunk/coregrind/m_main.c
trunk/tests/filter_stderr_basic
Modified: trunk/coregrind/m_main.c
===================================================================
--- trunk/coregrind/m_main.c 2009-07-23 21:13:14 UTC (rev 10571)
+++ trunk/coregrind/m_main.c 2009-07-24 04:47:04 UTC (rev 10572)
@@ -1013,8 +1013,8 @@
/* Core details */
umsg_or_xml(
- "%sBuilt with Valgrind and LibVEX; rerun with -h for copyright info%s\n",
- xpre, xpost
+ "%sUsing Valgrind-%s and LibVEX; rerun with -h for copyright info%s\n",
+ xpre, VERSION, xpost
);
if (VG_(clo_xml))
Modified: trunk/tests/filter_stderr_basic
===================================================================
--- trunk/tests/filter_stderr_basic 2009-07-23 21:13:14 UTC (rev 10571)
+++ trunk/tests/filter_stderr_basic 2009-07-24 04:47:04 UTC (rev 10572)
@@ -18,13 +18,10 @@
# Remove "WARNING: assuming toc 0x.." strings
sed "/^WARNING: assuming toc 0x*/d" |
-# Remove "Built with Valgrind and LibVEX..." line and the following
-# copyright notice line. Tools have to filter their own line themselves.
-sed "/^Built with Valgrind and LibVEX; rerun with -h for copyright info/ d" |
+# Remove "Using Valgrind-$VERSION and LibVEX..." line.
+# Tools have to filter their own line themselves.
+sed "/^Using Valgrind-.* and LibVEX; rerun with -h for copyright info/ d" |
-# ... and also remove the "Using LibVEX..." line and the one after it.
-sed "/^Using LibVEX, a library for dynamic binary translation/ , /./ d" |
-
# Anonymise line numbers in vg_replace_malloc.c, remove dirname if present
perl -p -e "s/(m_replacemalloc\/)?vg_replace_malloc.c:[0-9]*/vg_replace_malloc.c:.../" |
|