From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 24 Jul 2009 04:47:04 +0000 (+0000)
Subject: Add Valgrind version back into the preamble.
X-Git-Tag: svn/VALGRIND_3_5_0~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb2fa41714969075fe0e042a3a01293d779dd216;p=thirdparty%2Fvalgrind.git

Add Valgrind version back into the preamble.



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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 8f0ca7d672..4fd5311b4b 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1013,8 +1013,8 @@ static void print_preamble ( Bool logging_to_fd,
 
       /* 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))
diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index f792587af8..dfa50ecd45 100755
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -18,12 +18,9 @@ sed "/^--[0-9]\{1,7\}:0:*/d" |
 # 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" |
-
-# ... and also remove the "Using LibVEX..." line and the one after it.
-sed "/^Using LibVEX, a library for dynamic binary translation/ , /./ 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" |
 
 # 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:.../" |