From 17aedeeb8c427bddeead9f24e7f0c09a5f0607d9 Mon Sep 17 00:00:00 2001
From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sat, 20 Jun 2015 22:22:56 +0000
Subject: [PATCH] Filter 'New thread' lines gdb 7.9 reports new threads at
 different moment than the previous versions. Filter these new threads lines
 so as to not be dependent on this gdb aspect.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15347
---
 gdbserver_tests/filter_gdb                |  1 +
 gdbserver_tests/hginfo.stdoutB.exp        |  2 --
 gdbserver_tests/hgtls.stdoutB.exp         | 14 --------------
 gdbserver_tests/mcinfcallWSRU.stderrB.exp |  3 ---
 gdbserver_tests/nlcontrolc.stdoutB.exp    |  3 ---
 5 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
index 239e76f37..28bbf0b15 100755
--- a/gdbserver_tests/filter_gdb
+++ b/gdbserver_tests/filter_gdb
@@ -113,6 +113,7 @@ sed -e '/Remote debugging using/,/vgdb launched process attached/d'
     -e 's/^\([ \*] [1234] \) *Thread /\1Thread /'                                                     \
     -e 's/VgTs_WaitSys) 0x/VgTs_WaitSys)  0x/'                                                        \
     -e '/Cannot access memory at address 0x......../d'                                                \
+    -e '/\[New Thread/d'                                                                              \
     -e '/^$/d'                                                                                     |
 
 # remove all the lines telling where the SIGFPE was trapped.
diff --git a/gdbserver_tests/hginfo.stdoutB.exp b/gdbserver_tests/hginfo.stdoutB.exp
index 92d878df3..ed8863b91 100644
--- a/gdbserver_tests/hginfo.stdoutB.exp
+++ b/gdbserver_tests/hginfo.stdoutB.exp
@@ -1,10 +1,8 @@
 Breakpoint 1 at 0x........: file hg01_all_ok.c, line 13.
 Continuing.
-[New Thread ....]
 Breakpoint 1, breakme () at hg01_all_ok.c:13
 13	   if (shared == 1)
 Continuing.
-[New Thread ....]
 Breakpoint 1, breakme () at hg01_all_ok.c:13
 13	   if (shared == 1)
 Continuing.
diff --git a/gdbserver_tests/hgtls.stdoutB.exp b/gdbserver_tests/hgtls.stdoutB.exp
index 1fb3f20a3..e8e621b3d 100644
--- a/gdbserver_tests/hgtls.stdoutB.exp
+++ b/gdbserver_tests/hgtls.stdoutB.exp
@@ -1,58 +1,44 @@
 Breakpoint 1 at 0x........: file tls.c, line 55.
 Continuing.
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test race tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test race tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test local tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test local tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test global tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test global tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test static_extern tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test static_extern tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_extern tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_extern tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_local tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_local tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_global tls_ip 0x........ ip 0x........ equal 1
-[New Thread ....]
 Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
 55		int here = 0;
 test so_global tls_ip 0x........ ip 0x........ equal 1
diff --git a/gdbserver_tests/mcinfcallWSRU.stderrB.exp b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
index 571054529..bc88ef7df 100644
--- a/gdbserver_tests/mcinfcallWSRU.stderrB.exp
+++ b/gdbserver_tests/mcinfcallWSRU.stderrB.exp
@@ -2,15 +2,12 @@ relaying data between gdb and process ....
 vgdb-error value changed from 0 to 999999
 Breakpoint 1 at 0x........: file sleepers.c, line 72.
 Continuing.
-[New Thread ....]
 Breakpoint 1, sleeper_or_burner (v=0x........) at sleepers.c:72
 72	   int i = 0;
 Continuing.
-[New Thread ....]
 Breakpoint 1, sleeper_or_burner (v=0x........) at sleepers.c:72
 72	   int i = 0;
 Continuing.
-[New Thread ....]
 Breakpoint 1, sleeper_or_burner (v=0x........) at sleepers.c:72
 72	   int i = 0;
 Continuing.
diff --git a/gdbserver_tests/nlcontrolc.stdoutB.exp b/gdbserver_tests/nlcontrolc.stdoutB.exp
index 70f355b0a..7336633b7 100644
--- a/gdbserver_tests/nlcontrolc.stdoutB.exp
+++ b/gdbserver_tests/nlcontrolc.stdoutB.exp
@@ -1,9 +1,6 @@
 Continuing.
 Program received signal SIGTRAP, Trace/breakpoint trap.
 0x........ in syscall ...
-[New Thread ....]
-[New Thread ....]
-[New Thread ....]
   4 Thread .... (tid 4 VgTs_WaitSys)  0x........ in syscall ...
   3 Thread .... (tid 3 VgTs_WaitSys)  0x........ in syscall ...
   2 Thread .... (tid 2 VgTs_WaitSys)  0x........ in syscall ...