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