From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 26 Oct 2005 16:17:46 +0000 (+0000)
Subject: The version string from --version was being printed to stderr.  This
X-Git-Tag: svn/VALGRIND_3_1_0~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=084757de44381954305b200f9c07f05faab956ee;p=thirdparty%2Fvalgrind.git

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.



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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 2e1acd6a1d..87cefab9cc 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -998,6 +998,8 @@ static void get_helprequest_and_toolname ( Int* need_help, HChar** tool )
       vg_assert(str);
 
       if (VG_STREQ(str, "--version")) {
+         // Ensure the version string goes to stdout
+         VG_(clo_log_fd) = 1;
          VG_(printf)("valgrind-" VERSION "\n");
          VG_(exit)(0);
 
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 2e8730a799..f3c93dd7d9 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -2,7 +2,8 @@ SUBDIRS      = ${VG_ARCH}     .
 DIST_SUBDIRS = ${VG_ARCH_ALL} .
 
 noinst_SCRIPTS = \
-	filter_as_mmap filter_fdleak filter_none_discards filter_stderr
+	filter_as_mmap filter_cmdline0 \
+	filter_fdleak filter_none_discards filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
 	ansi.stderr.exp ansi.vgtest \
@@ -13,6 +14,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	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 \
diff --git a/none/tests/cmdline0.stderr.exp b/none/tests/cmdline0.stderr.exp
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/none/tests/cmdline0.stdout.exp b/none/tests/cmdline0.stdout.exp
new file mode 100644
index 0000000000..588c2ded3d
--- /dev/null
+++ b/none/tests/cmdline0.stdout.exp
@@ -0,0 +1 @@
+valgrind-XXX
diff --git a/none/tests/cmdline0.vgtest b/none/tests/cmdline0.vgtest
new file mode 100644
index 0000000000..03a051af82
--- /dev/null
+++ b/none/tests/cmdline0.vgtest
@@ -0,0 +1,2 @@
+vgopts: --version
+stdout_filter: filter_cmdline0
diff --git a/none/tests/filter_cmdline0 b/none/tests/filter_cmdline0
new file mode 100755
index 0000000000..3b56968baf
--- /dev/null
+++ b/none/tests/filter_cmdline0
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+sed "s/^valgrind-.*/valgrind-XXX/g"