Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.python/py-block.exp
diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 4b995da17095f71085a151152564ec36ae7cbdbe..745f84468d25735d55b9db2cbe21927755f9b4e9 100644
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -16,14 +16,10 @@
 # This file is part of the GDB testsuite.  It tests the mechanism
 # exposing values to Python.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 load_lib gdb-python.exp
 
-set testfile "py-block"
-set srcfile ${testfile}.c
+standard_testfile
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }