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 0fab2a28add8f3c3d6ec0cd555abbfaa47dfc5d9..2deb6bd5892e99ba474111320b1e1942d53da35d 100644 (file)
--- 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 cb7e515c48ee8eae334a87c8e6dab1b0f2c0367a..01df9ad01012af20611a1759c900a3eba4cd2ccc 100644 (file)
--- 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 e6b58ae0d32e7355c2143ae47267ed06878dbd4c..a301000137b734081eb157bcaa775a829391ffc5 100755 (executable)
--- 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]/'