diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ad37b0a2123..d101c23903a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-22  Yao Qi  <yao@codesourcery.com>
+
+	* boards/native-gdbserver.exp: New proc ${board}_exec.
+	* boards/native-stdio-gdbserver.exp: Likewise.
+
 2012-06-21  Tom Tromey  <tromey@redhat.com>
 
 	* lib/gdb.exp (skip_altivec_tests, skip_vsx_tests)
diff --git a/gdb/testsuite/boards/native-gdbserver.exp b/gdb/testsuite/boards/native-gdbserver.exp
index 5fa02a466c3..89702df43ba 100644
--- a/gdb/testsuite/boards/native-gdbserver.exp
+++ b/gdb/testsuite/boards/native-gdbserver.exp
@@ -64,6 +64,18 @@ proc ${board}_spawn { board cmd } {
     return $result
 }
 
+proc ${board}_exec { hostname program args } {
+    global board_info
+
+    set baseboard [lindex [split $hostname "/"] 0]
+
+    set board_info($baseboard,isremote) 0
+    set result [remote_exec $hostname $program $args]
+    set board_info($baseboard,isremote) 1
+
+    return $result
+}
+
 proc ${board}_download { board host dest } {
     return $host
 }
diff --git a/gdb/testsuite/boards/native-stdio-gdbserver.exp b/gdb/testsuite/boards/native-stdio-gdbserver.exp
index 703f3700a77..9804289017b 100644
--- a/gdb/testsuite/boards/native-stdio-gdbserver.exp
+++ b/gdb/testsuite/boards/native-stdio-gdbserver.exp
@@ -126,6 +126,18 @@ proc ${board}_spawn { board cmd } {
     return $result
 }
 
+proc ${board}_exec { hostname program args } {
+    global board_info
+
+    set baseboard [lindex [split $hostname "/"] 0]
+
+    set board_info($baseboard,isremote) 0
+    set result [remote_exec $hostname $program $args]
+    set board_info($baseboard,isremote) 1
+
+    return $result
+}
+
 proc ${board}_download { board host dest } {
     return $host
 }