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 8f0ca7d6724292a4ecc26113a78f007d89d14edc..4fd5311b4baa93ed0029699c45ddc8012da6bd1a 100644 (file)
--- 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 f792587af855412c2ccba7cfd325f4d33f3fed5f..dfa50ecd45c4370e502939754a5a504629292d7c 100755 (executable)
--- 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:.../" |