Merge GDB 7.5.1

gdb/testsuite/gdb.python/py-objfile-script.exp

Index: gdb/testsuite/gdb.python/py-objfile-script.exp
diff --git a/gdb/testsuite/gdb.python/py-objfile-script.exp b/gdb/testsuite/gdb.python/py-objfile-script.exp
index 2d6260cdd6e104bcaf565cc8d1f35277793ebab1..abdb12754f77052c16cd9fa4f54a6f4575a71686 100644
--- a/gdb/testsuite/gdb.python/py-objfile-script.exp
+++ b/gdb/testsuite/gdb.python/py-objfile-script.exp
@@ -16,15 +16,9 @@
 # This file is part of the GDB testsuite.  It tests automagic loading of
 # -gdb.py scripts.
 
-if $tracelevel then {
-    strace $tracelevel
-}
+standard_testfile
 
-set testfile "py-objfile-script"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
     return -1
 }
 
@@ -41,10 +35,11 @@ if { [skip_python_tests] } { continue }
 set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}-gdb.py.in ${subdir}/${testfile}-gdb.py]
 
 gdb_reinitialize_dir $srcdir/$subdir
+gdb_test_no_output "set auto-load safe-path ${remote_python_file}" "set auto-load safe-path"
 gdb_load ${binfile}
 
 # Verify gdb loaded the script.
-gdb_test "info auto-load-scripts" "Yes.*/${testfile}-gdb.py.*"
+gdb_test "info auto-load python-scripts" "Yes.*/${testfile}-gdb.py.*"
 
 if ![runto_main] {
     perror "couldn't run to main"