Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.python/py-inferior.exp
diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 68381381f984ed3741c558898c772d9222ee982a..b40a514396536c2bd6ca633d6d0fbe772d8b18b8 100644
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -16,14 +16,10 @@
 # This file is part of the GDB testsuite.  It tests the mechanism
 # exposing inferiors to Python.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 load_lib gdb-python.exp
 
-set testfile "py-inferior"
-set srcfile ${testfile}.c
+standard_testfile
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }
@@ -220,4 +216,4 @@ gdb_test "add-inferior" "Added inferior 3" "Create new inferior"
 gdb_test "inferior 3" ".*" "Switch to third inferior"
 gdb_test "py print gdb.selected_inferior().num" "3" "Third inferior selected"
 gdb_test "inferior 1" ".*" "Switch to first inferior"
-gdb_test_no_output "remove-inferiors 3" "Remove second inferior"
+gdb_test_no_output "remove-inferiors 3" "Remove second inferior"