|
From: <sv...@va...> - 2005-10-26 16:17:51
|
Author: njn
Date: 2005-10-26 17:17:46 +0100 (Wed, 26 Oct 2005)
New Revision: 4969
Log:
The version string from --version was being printed to stderr. This
commit fixes it to print to stdout. I added a regression test for this.
Added:
trunk/none/tests/cmdline0.stderr.exp
trunk/none/tests/cmdline0.stdout.exp
trunk/none/tests/cmdline0.vgtest
trunk/none/tests/filter_cmdline0
Modified:
trunk/coregrind/m_main.c
trunk/none/tests/Makefile.am
Modified: trunk/coregrind/m_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_main.c 2005-10-26 12:21:16 UTC (rev 4968)
+++ trunk/coregrind/m_main.c 2005-10-26 16:17:46 UTC (rev 4969)
@@ -998,6 +998,8 @@
vg_assert(str);
=20
if (VG_STREQ(str, "--version")) {
+ // Ensure the version string goes to stdout
+ VG_(clo_log_fd) =3D 1;
VG_(printf)("valgrind-" VERSION "\n");
VG_(exit)(0);
=20
Modified: trunk/none/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/Makefile.am 2005-10-26 12:21:16 UTC (rev 4968)
+++ trunk/none/tests/Makefile.am 2005-10-26 16:17:46 UTC (rev 4969)
@@ -2,7 +2,8 @@
DIST_SUBDIRS =3D ${VG_ARCH_ALL} .
=20
noinst_SCRIPTS =3D \
- filter_as_mmap filter_fdleak filter_none_discards filter_stderr
+ filter_as_mmap filter_cmdline0 \
+ filter_fdleak filter_none_discards filter_stderr
=20
EXTRA_DIST =3D $(noinst_SCRIPTS) \
ansi.stderr.exp ansi.vgtest \
@@ -13,6 +14,7 @@
bitfield1.stderr.exp bitfield1.vgtest \
blockfault.vgtest blockfault.stderr.exp blockfault.stdout.exp \
closeall.stderr.exp closeall.vgtest \
+ cmdline0.stderr.exp cmdline0.stdout.exp cmdline0.vgtest \
cmdline1.stderr.exp cmdline1.stdout.exp cmdline1.vgtest \
cmdline2.stderr.exp cmdline2.stdout.exp cmdline2.vgtest \
cmdline3.stderr.exp cmdline3.vgtest \
Added: trunk/none/tests/cmdline0.stderr.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Added: trunk/none/tests/cmdline0.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/cmdline0.stdout.exp 2005-10-26 12:21:16 UTC (rev 496=
8)
+++ trunk/none/tests/cmdline0.stdout.exp 2005-10-26 16:17:46 UTC (rev 496=
9)
@@ -0,0 +1 @@
+valgrind-XXX
Added: trunk/none/tests/cmdline0.vgtest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/cmdline0.vgtest 2005-10-26 12:21:16 UTC (rev 4968)
+++ trunk/none/tests/cmdline0.vgtest 2005-10-26 16:17:46 UTC (rev 4969)
@@ -0,0 +1,2 @@
+vgopts: --version
+stdout_filter: filter_cmdline0
Added: trunk/none/tests/filter_cmdline0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/filter_cmdline0 2005-10-26 12:21:16 UTC (rev 4968)
+++ trunk/none/tests/filter_cmdline0 2005-10-26 16:17:46 UTC (rev 4969)
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+sed "s/^valgrind-.*/valgrind-XXX/g"
Property changes on: trunk/none/tests/filter_cmdline0
___________________________________________________________________
Name: svn:executable
+ *
|