bd144c9
commit 21788250c945713fa25c16f2683e1f9cd0bb6ccf
bd144c9
Author: philippe <philippe@a5019735-40e9-0310-863c-91ae7b9d1cf9>
bd144c9
Date:   Sun Jun 25 12:40:53 2017 +0000
bd144c9
bd144c9
    Fix some tests failure with GDB 8.0
bd144c9
    
bd144c9
    At the beginning of a Valgrind gdbserver test,
bd144c9
    2 messages are produced when launching the command
bd144c9
       target remote | vgdb
bd144c9
    
bd144c9
    A message output by vgdb:
bd144c9
       relaying data between gdb and process <pid>
bd144c9
    (this message is read by GDB from the vgdb pipe, and re-output
bd144c9
    on stderr)
bd144c9
    and a message produced by GDB:
bd144c9
       Remote debugging using | ./vgdb
bd144c9
    
bd144c9
    GDB 8.0 changes the order in which the above messages are output.
bd144c9
    This causes 2 tests to fail, as the 'relaying' line appears
bd144c9
    then in a part of the output deleted by a filter script.
bd144c9
    
bd144c9
    To avoid this, change the filter scripts to always remove
bd144c9
    this 'relaying line', which is not particularly interesting to check.
bd144c9
    All the .exp files containining such a 'relaying' line are updated
bd144c9
    accordingly.
bd144c9
    
bd144c9
    This has been tested with various gdb versions (7.5, 7.7, 7.12, 8.0)
bd144c9
    on amd64 and/or ppc64.
bd144c9
    
bd144c9
    Thanks to Mark Wielaard, which helped to investigate this problem
bd144c9
    by bisecting the GDB patches in GDB 8.0 causing this change of
bd144c9
    behaviour.
bd144c9
    
bd144c9
    
bd144c9
    
bd144c9
    
bd144c9
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16453 a5019735-40e9-0310-863c-91ae7b9d1cf9
bd144c9
bd144c9
diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
bd144c9
index 7177720..ed78cfe 100755
bd144c9
--- a/gdbserver_tests/filter_gdb
bd144c9
+++ b/gdbserver_tests/filter_gdb
bd144c9
@@ -72,7 +72,7 @@ sed -e '/Remote debugging using/,/vgdb launched process attached/d'
bd144c9
     -e '/^Missing separate debuginfo/d'                                                               \
bd144c9
     -e '/\/_exit.c: No such file or directory/d'                                                      \
bd144c9
     -e '/^Try: zypper install -C/d'                                                                   \
bd144c9
-    -e 's/\(relaying data between gdb and process \)[0-9][0-9]*/\1..../'                              \
bd144c9
+    -e '/relaying data between gdb and process/d'                                                     \
bd144c9
     -e 's/pid [0-9][0-9]*/pid ..../g'                                                                 \
bd144c9
     -e 's/Thread [0-9][0-9]*/Thread ..../g'                                                           \
bd144c9
     -e '/\[Switching to Thread ....\]/d'                                                              \
bd144c9
diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb
bd144c9
index 2442ec5..f8028a3 100755
bd144c9
--- a/gdbserver_tests/filter_vgdb
bd144c9
+++ b/gdbserver_tests/filter_vgdb
bd144c9
@@ -11,7 +11,7 @@ $dir/../tests/filter_addresses                  |
bd144c9
 #             pid
bd144c9
 # gdb 7.2 sometimes tries to access address 0x0 (same as with standard gdbserver)
bd144c9
 # filter a debian 6.0/ppc32 line
bd144c9
-sed -e 's/\(relaying data between gdb and process \)[0-9][0-9]*/\1..../' \
bd144c9
+sed -e '/relaying data between gdb and process/d'                        \
bd144c9
     -e 's/\(sending command .* to pid \)[0-9][0-9]*/\1..../'             \
bd144c9
     -e '/Cannot access memory at address 0x......../d'                   \
bd144c9
     -e '/^[1-9][0-9]*	\.\.\/sysdeps\/powerpc\/powerpc32\/dl-start\.S: No such file or directory\./d' |
bd144c9
diff --git a/gdbserver_tests/hginfo.stderrB.exp b/gdbserver_tests/hginfo.stderrB.exp
bd144c9
index df47f11..669ff92 100644
bd144c9
--- a/gdbserver_tests/hginfo.stderrB.exp
bd144c9
+++ b/gdbserver_tests/hginfo.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 Lock ga 0x........ {
bd144c9
  Address 0x........ is 0 bytes inside data symbol "mx"
bd144c9
diff --git a/gdbserver_tests/mcblocklistsearch.stderrB.exp b/gdbserver_tests/mcblocklistsearch.stderrB.exp
bd144c9
index 312d776..1313321 100644
bd144c9
--- a/gdbserver_tests/mcblocklistsearch.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcblocklistsearch.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 Breakpoint 1 at 0x........: file leak-tree.c, line 42.
bd144c9
 Breakpoint 2 at 0x........: file leak-tree.c, line 67.
bd144c9
diff --git a/gdbserver_tests/mcbreak.stderrB.exp b/gdbserver_tests/mcbreak.stderrB.exp
bd144c9
index 65281d2..0f051d1 100644
bd144c9
--- a/gdbserver_tests/mcbreak.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcbreak.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 vgdb-error value changed from 999999 to 0
bd144c9
 n_errs_found 1 n_errs_shown 1 (vgdb-error 0) 
bd144c9
diff --git a/gdbserver_tests/mcclean_after_fork.stderrB.exp b/gdbserver_tests/mcclean_after_fork.stderrB.exp
bd144c9
index 995b42f..e812b8e 100644
bd144c9
--- a/gdbserver_tests/mcclean_after_fork.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcclean_after_fork.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 monitor command request to kill this process
bd144c9
 Remote connection closed
bd144c9
diff --git a/gdbserver_tests/mcinfcallWSRU.stderrB.exp b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
bd144c9
index 7789123..a2f2b87 100644
bd144c9
--- a/gdbserver_tests/mcinfcallWSRU.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 Breakpoint 1 at 0x........: file sleepers.c, line 74.
bd144c9
 Continuing.
bd144c9
diff --git a/gdbserver_tests/mcleak.stderrB.exp b/gdbserver_tests/mcleak.stderrB.exp
bd144c9
index 7782119..7ed3920 100644
bd144c9
--- a/gdbserver_tests/mcleak.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcleak.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 10 bytes in 1 blocks are still reachable in loss record ... of ...
bd144c9
    at 0x........: malloc (vg_replace_malloc.c:...)
bd144c9
diff --git a/gdbserver_tests/mcmain_pic.stderrB.exp b/gdbserver_tests/mcmain_pic.stderrB.exp
bd144c9
index c90e1fa..53ec0ce 100644
bd144c9
--- a/gdbserver_tests/mcmain_pic.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcmain_pic.stderrB.exp
bd144c9
@@ -1,2 +1 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
diff --git a/gdbserver_tests/mcvabits.stderrB.exp b/gdbserver_tests/mcvabits.stderrB.exp
bd144c9
index bdabb1e..f9ced7a 100644
bd144c9
--- a/gdbserver_tests/mcvabits.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mcvabits.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 Address 0x........ len 10 addressable
bd144c9
  Address 0x........ is 0 bytes inside data symbol "undefined"
bd144c9
diff --git a/gdbserver_tests/mssnapshot.stderrB.exp b/gdbserver_tests/mssnapshot.stderrB.exp
bd144c9
index 8bee8fc..e419ce6 100644
bd144c9
--- a/gdbserver_tests/mssnapshot.stderrB.exp
bd144c9
+++ b/gdbserver_tests/mssnapshot.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 general valgrind monitor commands:
bd144c9
   help [debug]            : monitor command help. With debug: + debugging commands
bd144c9
diff --git a/gdbserver_tests/nlgone_abrt.stderrB.exp b/gdbserver_tests/nlgone_abrt.stderrB.exp
bd144c9
index c8b2024..e69de29 100644
bd144c9
--- a/gdbserver_tests/nlgone_abrt.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlgone_abrt.stderrB.exp
bd144c9
@@ -1 +0,0 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
diff --git a/gdbserver_tests/nlgone_exit.stderrB.exp b/gdbserver_tests/nlgone_exit.stderrB.exp
bd144c9
index c8b2024..e69de29 100644
bd144c9
--- a/gdbserver_tests/nlgone_exit.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlgone_exit.stderrB.exp
bd144c9
@@ -1 +0,0 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
diff --git a/gdbserver_tests/nlgone_return.stderrB.exp b/gdbserver_tests/nlgone_return.stderrB.exp
bd144c9
index c8b2024..e69de29 100644
bd144c9
--- a/gdbserver_tests/nlgone_return.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlgone_return.stderrB.exp
bd144c9
@@ -1 +0,0 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
diff --git a/gdbserver_tests/nlpasssigalrm.stderrB.exp b/gdbserver_tests/nlpasssigalrm.stderrB.exp
bd144c9
index c90e1fa..53ec0ce 100644
bd144c9
--- a/gdbserver_tests/nlpasssigalrm.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlpasssigalrm.stderrB.exp
bd144c9
@@ -1,2 +1 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
diff --git a/gdbserver_tests/nlself_invalidate.stderrB.exp b/gdbserver_tests/nlself_invalidate.stderrB.exp
bd144c9
index c8b2024..e69de29 100644
bd144c9
--- a/gdbserver_tests/nlself_invalidate.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlself_invalidate.stderrB.exp
bd144c9
@@ -1 +0,0 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
diff --git a/gdbserver_tests/nlsigvgdb.stderrB.exp b/gdbserver_tests/nlsigvgdb.stderrB.exp
bd144c9
index 672fea5..ed5bb61 100644
bd144c9
--- a/gdbserver_tests/nlsigvgdb.stderrB.exp
bd144c9
+++ b/gdbserver_tests/nlsigvgdb.stderrB.exp
bd144c9
@@ -1,4 +1,3 @@
bd144c9
-relaying data between gdb and process ....
bd144c9
 vgdb-error value changed from 0 to 999999
bd144c9
 gdbserver: continuing in 5000 ms ...
bd144c9
 gdbserver: continuing after wait ...