Fix TCL error in gdb.python/py-format-string.exp.

2020-06-17 Sandra Loosemore <sandra@codesourcery.com>

	gdb/testsuite/
	* gdb.python/py-format-string.exp: Move test for python support
	earlier, out of function body.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d7671915aa2aa7dc06ac226941a3c274e5b85c3..2d604089986e3fa4c8f2b8abc759ae6cdc7f1c27 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-06-17 Sandra Loosemore <sandra@codesourcery.com>
+
+       Fix TCL error in gdb.python/py-format-string.exp.
+
+       * gdb.python/py-format-string.exp: Move test for python support
+       earlier, out of function body.
+
 2020-06-15  Simon Marchi  <simon.marchi@efficios.com>
 
        * gdb.base/index-cache-load-twice.c: New.

diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp
index f809ef30cb39896a8efee3c4b5c8451843f1bc52..792d60c09dbe1025fb0b597ab0a221c965f71dd3 100644 (file)
--- a/gdb/testsuite/gdb.python/py-format-string.exp
+++ b/gdb/testsuite/gdb.python/py-format-string.exp
@@ -24,6 +24,11 @@ if [get_compiler_info c++] {
     return -1
 }
 
+# Skip all tests if Python scripting is not enabled.
+gdb_exit
+gdb_start
+if { [skip_python_tests] } { continue }
+
 # Build inferior to language specification.
 proc build_inferior {exefile lang} {
   global srcdir subdir srcfile testfile hex
@@ -45,9 +50,6 @@ proc prepare_gdb {exefile} {
   gdb_reinitialize_dir $srcdir/$subdir
   gdb_load ${exefile}
 
-  # Skip all tests if Python scripting is not enabled.
-  if { [skip_python_tests] } { continue }
-
   if ![runto_main] then {
       perror "couldn't run to breakpoint"
       return