[binutils-gdb] gdb.threads/multi-create-ns-info-thr.exp and native-extended-remote board

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a47cd6e95a6eeaae01c96b89880330c4c1db0c4b

commit a47cd6e95a6eeaae01c96b89880330c4c1db0c4b
Author: Pedro Alves <palves@redhat.com>
Date:   Sat Feb 21 12:03:23 2015 +0000

    gdb.threads/multi-create-ns-info-thr.exp and native-extended-remote board
    
    The buildbot shows that the new
    gdb.threads/multi-create-ns-info-thr.exp test is timing out when
    tested with --target=native-extended-remote.  The reason is:
    
     No breakpoints or watchpoints.
     (gdb) break main
     Breakpoint 1 at 0x10000b00: file ../../../binutils-gdb/gdb/testsuite/gdb.threads/multi-create.c, line 72.
     (gdb) run
     Starting program: /home/gdb-buildbot/fedora-21-ppc64be-1/fedora-ppc64be-native-extended-gdbserver/build/gdb/testsuite/outputs/gdb.threads/multi-create-ns-info-thr/multi-cre
     ate-ns-info-thr
     Process /home/gdb-buildbot/fedora-21-ppc64be-1/fedora-ppc64be-native-extended-gdbserver/build/gdb/testsuite/outputs/gdb.threads/multi-create-ns-info-thr/multi-create-ns-inf
     o-thr created; pid = 16266
     Unexpected vCont reply in non-stop mode: T0501:00003fffffffd190;40:00000080560fe290;thread:p3f8a.3f8a;core:0;
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     (gdb) break multi-create.c:45
     Breakpoint 2 at 0x10000994: file ../../../binutils-gdb/gdb/testsuite/gdb.threads/multi-create.c, line 45.
     (gdb) commands
     Type commands for breakpoint(s) 2, one per line.
    
    Non-stop tests don't really work with the
    --target_board=native-extended-remote board, because tests toggle
    non-stop on after GDB is already connected to gdbserver, while
    Currently, non-stop must be enabled before connecting.
    
    This adjusts the test to bail if running to main fails, like all other
    non-stop tests.
    
    Note non-stop tests do work with --target_board=native-gdbserver.
    
    gdb/testsuite/ChangeLog:
    2015-02-21  Pedro Alves  <palves@redhat.com>
    
    	* gdb.threads/multi-create-ns-info-thr.exp: Return early if
    	runto_main fails.

Diff:
---
 gdb/testsuite/ChangeLog                                | 5 +++++
 gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e1ee53..c64aeda 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-21  Pedro Alves  <palves@redhat.com>
+
+	* gdb.threads/multi-create-ns-info-thr.exp: Return early if
+	runto_main fails.
+
 2015-02-20  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/solib-corrupted.exp: Expect "stap" as first column of
diff --git a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
index 906532e..51e537e 100644
--- a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
+++ b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
@@ -25,7 +25,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
 gdb_test_no_output "set pagination off"
 gdb_test_no_output "set non-stop on"
 
-runto_main
+if ![runto_main] {
+    return -1
+}
 
 # Create a breakpoint that does "info threads" when hit, which will be
 # just while other threads are being created or exiting.