From: Pedro Alves <palves@redhat.com>
Date: Wed, 29 Jul 2015 10:09:46 +0000 (+0100)
Subject: interrupt.exp: Revert back to checking gdb,noinferiorio at the top
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;ds=sidebyside;h=8b75dd3b8a32e790d7d9f1621ad4fbb6d7af9e8e;p=deliverable%2Fbinutils-gdb.git

interrupt.exp: Revert back to checking gdb,noinferiorio at the top

The following patch will remove the gdb,noinferiorio setting from the
gdbserver boards, so this bit can be reverted.

gdb/testsuite/ChangeLog:
2015-07-29  Pedro Alves  <palves@redhat.com>

	* gdb.base/interrupt.exp: Revert back to checking gdb,noinferiorio
	at the top.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 072a1083c9..b03adc7aff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-29  Pedro Alves  <palves@redhat.com>
+
+	* gdb.base/interrupt.exp: Revert back to checking gdb,noinferiorio
+	at the top.
+
 2015-07-29  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/call-ar-st.c: Include "../lib/unbuffer_output.c".
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index f594ba41d9..426c2a67ed 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -18,6 +18,11 @@ if [target_info exists gdb,nointerrupts] {
     continue
 }
 
+if [target_info exists gdb,noinferiorio] {
+    verbose "Skipping interrupt.exp because of noinferiorio."
+    return
+}
+
 standard_testfile
 
 set options { debug }
@@ -45,11 +50,6 @@ if ![file exists $binfile] then {
     if [runto_main] then {
 	global inferior_spawn_id gdb_spawn_id
 
-	if {[target_info exists gdb,noinferiorio] && $inferior_spawn_id == $gdb_spawn_id} {
-	    verbose "Skipping interrupt.exp because of noinferiorio."
-	    return
-	}
-
 	set msg "process is alive"
 	gdb_test_multiple "continue" $msg {
 	    -i "$inferior_spawn_id" -re "talk to me baby\r\n" {