From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 20 Aug 2009 18:38:59 +0000 (+0000)
Subject: Fixed bug #204317: regression tests none/tests/cmdline[12] fail if
X-Git-Tag: svn/VALGRIND_3_6_0~537
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba7848aca3752186626af5bac0674a778f50b1a2;p=thirdparty%2Fvalgrind.git

Fixed bug #204317: regression tests none/tests/cmdline[12] fail if
the gdb path detected by configure differs from /usr/bin/gdb.


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

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 0fab2a28ad..2deb6bd589 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -31,7 +31,7 @@ usage: valgrind [options] prog-and-args
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
     --db-attach=no|yes        start debugger when errors detected? [no]
-    --db-command=<command>    command to start debugger [/usr/bin/gdb -nw %f %p]
+    --db-command=<command>    command to start debugger [... -nw %f %p]
     --input-fd=<number>       file descriptor for input [0=stdin]
     --dsymutil=no|yes         run dsymutil on Mac OS X when helpful? [no]
     --max-stackframe=<number> assume stack switch for SP changes larger
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index cb7e515c48..01df9ad010 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -31,7 +31,7 @@ usage: valgrind [options] prog-and-args
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
     --db-attach=no|yes        start debugger when errors detected? [no]
-    --db-command=<command>    command to start debugger [/usr/bin/gdb -nw %f %p]
+    --db-command=<command>    command to start debugger [... -nw %f %p]
     --input-fd=<number>       file descriptor for input [0=stdin]
     --dsymutil=no|yes         run dsymutil on Mac OS X when helpful? [no]
     --max-stackframe=<number> assume stack switch for SP changes larger
diff --git a/none/tests/filter_cmdline1 b/none/tests/filter_cmdline1
index e6b58ae0d3..a301000137 100755
--- a/none/tests/filter_cmdline1
+++ b/none/tests/filter_cmdline1
@@ -1,4 +1,5 @@
 #! /bin/sh
 
-perl -p -e 's/(set minimum alignment of heap allocations) \[(8|16)\]/$1 [...]/'
+sed -e 's/\(set minimum alignment of heap allocations\) \[[0-9]*\]/\1 [...]/' \
+    -e 's/\(command to start debugger\) \[.* -nw %f %p\]/\1 [... -nw %f %p]/'