Merge GDB 7.5.1

gdb/testsuite/gdb.python/py-prompt.exp

Index: gdb/testsuite/gdb.python/py-prompt.exp
diff --git a/gdb/testsuite/gdb.python/py-prompt.exp b/gdb/testsuite/gdb.python/py-prompt.exp
index 4d710905bf84c7a77f9daf5176be0134a63d9119..b5d9368d0d5dc0aa46f4801f2397ea4d52582ddb 100644
--- a/gdb/testsuite/gdb.python/py-prompt.exp
+++ b/gdb/testsuite/gdb.python/py-prompt.exp
@@ -16,14 +16,12 @@
 # This file is part of the GDB testsuite.  It tests the mechanism
 # for defining the prompt in Python.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile "py-prompt"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
+# We need to use TCL's exec to get the pid.
+if [is_remote target] then {
+    return 0
+}
 
 load_lib gdb-python.exp
 load_lib prompt.exp
@@ -38,8 +36,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 if { [skip_python_tests] } { continue }
 gdb_exit
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested py-prompt.exp
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     return -1
 }