Merge GDB 7.5.1

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

 # Copyright (C) 2009-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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 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
 }
 
 # Start with a fresh gdb.
 clean_restart ${testfile}
 
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
@@ skipping 176 matching lines @@
          "Check inferior validity"
 
 # Test gdb.selected_inferior()
 gdb_test "inferior 1" ".*" "Switch to first inferior"
 gdb_test "py print gdb.selected_inferior().num" "1" "First inferior selected"
 
 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"