* gas/config/tc-avr.c: Change ISA for devices with USB support to

[external/binutils.git] / gdb / testsuite / gdb.mi / mi-nsintrall.exp

diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
index b0d7b71..185d338 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This only works with native configurations
-if {![isnative]} {
-  return
+if { ![support_displaced_stepping] } { 
+    unsupported "displaced stepping"
+    return -1
 }
 
 load_lib mi-support.exp
@@ -29,11 +29,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "nsintrall"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile nsintrall.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }
@@ -41,51 +39,13 @@ if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $option
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load $binfile
 
-set supported 0
-send_gdb "-gdb-show non-stop\n"
-gdb_expect {
-    -re ".*\\^done,value=\"off\",supported=\"(\[^\"\]+)\"\r\n$mi_gdb_prompt$" {
-       if { $expect_out(1,string) == "1" } {
-           set supported 1
-       }
-    }
-    -re ".$mi_gdb_prompt$" {
-    }
-}
-
 mi_gdb_test "-gdb-set non-stop 1" ".*"
 mi_gdb_test "-gdb-set target-async 1" ".*"
-detect_async
-
-mi_gdb_test "200-break-insert -t main" ".*"
-
-set created "=thread-created,id=\"$decimal\"\r\n"
-set running "\\*running,thread-id=\"$decimal\"\r\n"
-
-set notifs "($created)*($running)*"
-
-# Note: presently, we skip this test on non-native targets,
-# so 'run' is OK.  As soon as we start to run this on remote
-# target, the logic from mi_run_cmd will have to be refactored.
-send_gdb "-exec-run\n"
-gdb_expect {
-    -re "\\^running\r\n$notifs$mi_gdb_prompt" {
-    }
-    -re "\\^error,msg=\"The target does not support running in non-stop mode.\"" {
-       verbose -log "Non-stop mode not supported, skipping all tests"
-       return
-    }
-    -re "\r\n$mi_gdb_prompt" {
-       perror "Cannot start target (unknown output after running)"
-       return -1
-    }
-    timeout {
-       perror "Cannot start target (timeout)"
-       return -1
-    }
+mi_detect_async
+
+if { [mi_run_to_main] < 0 } {
+    continue
 }
-mi_expect_stop "breakpoint-hit" main ".*" ".*" "\[0-9\]+" \
-    { "" "disp=\"del\"" } "run to main"
 
 mi_create_breakpoint thread_function 2 keep thread_function .* .* .* \
     "breakpoint at thread_function"
@@ -103,20 +63,17 @@ mi_check_thread_states \
 # now that we know about all the threads, we can get rid of the breakpoints
 mi_delete_breakpoints
 
+# Here we create a response string.  Note we don't want \r\n at the end,
+# since mi_gdb_test will append this itself.
 set running_re ""
-for {set i 6} {$i > 0} {incr i -1} {
+for {set i 6} {$i > 1} {incr i -1} {
     set running_re "$running_re\\*running,thread-id=\"$i\"\r\n"
 }
+set running_re "$running_re\\*running,thread-id=\"1\""
+
+mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
+    "resume all, no breakpoint"
 
-send_gdb "-exec-continue --all\n"
-gdb_expect {
-    -re ".*$running_re$mi_gdb_prompt" {
-       pass "resume all, no breakpoint"
-    }
-    timeout {
-       fail "resume all, no breakpoint (timeout)"
-    }
-}
 mi_check_thread_states \
     {"running" "running" "running" "running" "running" "running"} \
     "thread state, resume all"
@@ -131,15 +88,8 @@ mi_check_thread_states \
     "thread state, all interrupted"
 
 # resume all threads, and check that no thread is spuriously left interrupted
-send_gdb "-exec-continue --all\n"
-gdb_expect {
-    -re ".*$running_re$mi_gdb_prompt" {
-       pass "resume all after interrupting"
-    }
-    timeout {
-       fail "resume all after interrupting (timeout)"
-    }
-}
+mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \
+    "resume all after interrupting"
 
 sleep 1
 mi_check_thread_states \