|
From: <sv...@va...> - 2009-07-14 06:55:16
|
Author: njn
Date: 2009-07-14 07:55:05 +0100 (Tue, 14 Jul 2009)
New Revision: 10451
Log:
Shorten the preamble by moving some of it into the --help output. This
partly fixes bug 197933.
Modified:
trunk/coregrind/m_main.c
trunk/memcheck/tests/long_namespace_xml.stderr.exp
trunk/memcheck/tests/xml1.stderr.exp32
trunk/memcheck/tests/xml1.stderr.exp64
trunk/none/tests/cmdline1.stdout.exp
trunk/none/tests/cmdline2.stdout.exp
trunk/tests/filter_stderr_basic
Modified: trunk/coregrind/m_main.c
===================================================================
--- trunk/coregrind/m_main.c 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/coregrind/m_main.c 2009-07-14 06:55:05 UTC (rev 10451)
@@ -207,12 +207,11 @@
"\n"
" Extra options read from ~/.valgrindrc, $VALGRIND_OPTS, ./.valgrindrc\n"
"\n"
-" Valgrind is Copyright (C) 2000-2009 Julian Seward et al.\n"
-" and licensed under the GNU General Public License, version 2.\n"
-" Bug reports, feedback, admiration, abuse, etc, to: %s.\n"
+" %s is %s\n"
+" Valgrind is Copyright (C) 2000-2009, and GNU GPL'd, by Julian Seward et al\n"
+" LibVEX is Copyright (C) 2004-2009, and GNU GPL'd, by OpenWorks LLP\n"
"\n"
-" Tools are copyright and licensed by their authors. See each\n"
-" tool's start-up message for more information.\n"
+" Bug reports, feedback, admiration, abuse, etc, to: %s.\n"
"\n";
Char* gdb_path = GDB_PATH;
@@ -242,7 +241,8 @@
VG_(printf)(" (none)\n");
}
}
- VG_(printf)(usage3, VG_BUGS_TO);
+ VG_(printf)(usage3, VG_(details).name, VG_(details).copyright_author,
+ VG_BUGS_TO);
VG_(exit)(0);
}
@@ -789,10 +789,8 @@
VG_(details).description,
xpost);
- if (VG_(strlen)(toolname) >= 4
- && 0 == VG_(strncmp)(toolname, "exp-", 4)) {
- VG_(message)(
- Vg_UserMsg,
+ if (VG_(strlen)(toolname) >= 4 && VG_STREQN(4, toolname, "exp-")) {
+ VG_UMSG(
"%sNOTE: This is an Experimental-Class Valgrind Tool.%s",
xpre, xpost
);
@@ -802,22 +800,10 @@
xpre, VG_(details).copyright_author, xpost);
/* Core details */
- VG_(message)(Vg_UserMsg,
- "%sUsing LibVEX, a library for dynamic binary translation.%s",
- xpre, xpost );
VG_(message)(Vg_UserMsg,
- "%sCopyright (C) 2004-2009, and GNU GPL'd, by OpenWorks LLP.%s",
+ "%sBuilt with Valgrind and LibVEX; rerun with -h for copyright info%s",
xpre, xpost );
- VG_(message)(Vg_UserMsg,
- "%sUsing valgrind-%s, a dynamic binary instrumentation framework.%s",
- xpre, VERSION, xpost);
- VG_(message)(Vg_UserMsg,
- "%sCopyright (C) 2000-2009, and GNU GPL'd, by Julian Seward et al.%s",
- xpre, xpost );
- if (VG_(clo_verbosity) == 1 && !VG_(clo_xml))
- VG_(message)(Vg_UserMsg, "For more details, rerun with: -v");
-
if (VG_(clo_xml))
VG_(message)(Vg_UserMsg, "</preamble>");
}
Modified: trunk/memcheck/tests/long_namespace_xml.stderr.exp
===================================================================
--- trunk/memcheck/tests/long_namespace_xml.stderr.exp 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/memcheck/tests/long_namespace_xml.stderr.exp 2009-07-14 06:55:05 UTC (rev 10451)
@@ -8,9 +8,6 @@
<line>...</line>
<line>...</line>
<line>...</line>
- <line>...</line>
- <line>...</line>
- <line>...</line>
</preamble>
<pid>...</pid>
Modified: trunk/memcheck/tests/xml1.stderr.exp32
===================================================================
--- trunk/memcheck/tests/xml1.stderr.exp32 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/memcheck/tests/xml1.stderr.exp32 2009-07-14 06:55:05 UTC (rev 10451)
@@ -8,9 +8,6 @@
<line>...</line>
<line>...</line>
<line>...</line>
- <line>...</line>
- <line>...</line>
- <line>...</line>
</preamble>
<pid>...</pid>
Modified: trunk/memcheck/tests/xml1.stderr.exp64
===================================================================
--- trunk/memcheck/tests/xml1.stderr.exp64 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/memcheck/tests/xml1.stderr.exp64 2009-07-14 06:55:05 UTC (rev 10451)
@@ -8,9 +8,6 @@
<line>...</line>
<line>...</line>
<line>...</line>
- <line>...</line>
- <line>...</line>
- <line>...</line>
</preamble>
<pid>...</pid>
Modified: trunk/none/tests/cmdline1.stdout.exp
===================================================================
--- trunk/none/tests/cmdline1.stdout.exp 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/none/tests/cmdline1.stdout.exp 2009-07-14 06:55:05 UTC (rev 10451)
@@ -51,10 +51,9 @@
Extra options read from ~/.valgrindrc, $VALGRIND_OPTS, ./.valgrindrc
- Valgrind is Copyright (C) 2000-2009 Julian Seward et al.
- and licensed under the GNU General Public License, version 2.
+ Nulgrind is Copyright (C) 2002-2009, and GNU GPL'd, by Nicholas Nethercote.
+ Valgrind is Copyright (C) 2000-2009, and GNU GPL'd, by Julian Seward et al
+ LibVEX is Copyright (C) 2004-2009, and GNU GPL'd, by OpenWorks LLP
+
Bug reports, feedback, admiration, abuse, etc, to: www.valgrind.org.
- Tools are copyright and licensed by their authors. See each
- tool's start-up message for more information.
-
Modified: trunk/none/tests/cmdline2.stdout.exp
===================================================================
--- trunk/none/tests/cmdline2.stdout.exp 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/none/tests/cmdline2.stdout.exp 2009-07-14 06:55:05 UTC (rev 10451)
@@ -96,10 +96,9 @@
Extra options read from ~/.valgrindrc, $VALGRIND_OPTS, ./.valgrindrc
- Valgrind is Copyright (C) 2000-2009 Julian Seward et al.
- and licensed under the GNU General Public License, version 2.
+ Nulgrind is Copyright (C) 2002-2009, and GNU GPL'd, by Nicholas Nethercote.
+ Valgrind is Copyright (C) 2000-2009, and GNU GPL'd, by Julian Seward et al
+ LibVEX is Copyright (C) 2004-2009, and GNU GPL'd, by OpenWorks LLP
+
Bug reports, feedback, admiration, abuse, etc, to: www.valgrind.org.
- Tools are copyright and licensed by their authors. See each
- tool's start-up message for more information.
-
Modified: trunk/tests/filter_stderr_basic
===================================================================
--- trunk/tests/filter_stderr_basic 2009-07-14 06:39:10 UTC (rev 10450)
+++ trunk/tests/filter_stderr_basic 2009-07-14 06:55:05 UTC (rev 10451)
@@ -18,17 +18,13 @@
# Remove "WARNING: assuming toc 0x.." strings
sed "/^WARNING: assuming toc 0x*/d" |
-# Remove "Using valgrind..." line and the following
+# Remove "Built with Valgrind and LibVEX..." line and the following
# copyright notice line. Tools have to filter their own line themselves.
-sed "/^Using valgrind-.*, a dynamic binary instrumentation framework/ , /./ d" |
+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 other introductory lines
-sed "/Estimated CPU clock rate is [0-9]* MHz/d" |
-sed "/For more details, rerun with: -v/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:.../" |
|