Reindent gdb.ada tests

Message ID 20251216210441.3025173-1-tromey@adacore.com
State New
Headers
Series Reindent gdb.ada tests |

Commit Message

Tom Tromey Dec. 16, 2025, 9:04 p.m. UTC
  Various gdb.ada tests had incorrect indentation.  This patch reformats
these.  It was written by script.
---
 gdb/testsuite/gdb.ada/O2_float_param.exp      | 26 +++----
 gdb/testsuite/gdb.ada/access_tagged_param.exp |  6 +-
 .../gdb.ada/access_to_packed_array.exp        |  2 +-
 gdb/testsuite/gdb.ada/addr_arith.exp          | 12 +--
 gdb/testsuite/gdb.ada/arr_arr.exp             |  4 +-
 gdb/testsuite/gdb.ada/array_bounds.exp        | 12 +--
 gdb/testsuite/gdb.ada/array_char_idx.exp      |  6 +-
 gdb/testsuite/gdb.ada/array_return.exp        | 40 +++++-----
 .../gdb.ada/array_subscript_addr.exp          |  4 +-
 gdb/testsuite/gdb.ada/arraydim.exp            |  6 +-
 gdb/testsuite/gdb.ada/arrayidx.exp            | 48 ++++++------
 gdb/testsuite/gdb.ada/assign_1.exp            |  6 +-
 gdb/testsuite/gdb.ada/assign_arr.exp          |  6 +-
 gdb/testsuite/gdb.ada/assoc.exp               |  2 +-
 gdb/testsuite/gdb.ada/atomic_enum.exp         |  6 +-
 .../gdb.ada/attr_ref_and_charlit.exp          |  4 +-
 gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp | 10 +--
 gdb/testsuite/gdb.ada/big_packed_array.exp    | 48 ++++++------
 gdb/testsuite/gdb.ada/boolean_expr.exp        |  6 +-
 gdb/testsuite/gdb.ada/bp_c_mixed_case.exp     | 40 +++++-----
 gdb/testsuite/gdb.ada/bp_enum_homonym.exp     | 10 +--
 gdb/testsuite/gdb.ada/bp_fun_addr.exp         |  6 +-
 gdb/testsuite/gdb.ada/bp_inlined_func.exp     | 12 +--
 gdb/testsuite/gdb.ada/bp_on_var.exp           |  6 +-
 gdb/testsuite/gdb.ada/bp_range_type.exp       |  8 +-
 gdb/testsuite/gdb.ada/bp_reset.exp            |  6 +-
 gdb/testsuite/gdb.ada/break-label.exp         |  2 +-
 gdb/testsuite/gdb.ada/byte_packed_arr.exp     |  2 +-
 gdb/testsuite/gdb.ada/call_pn.exp             |  4 +-
 gdb/testsuite/gdb.ada/catch_assert_if.exp     | 18 ++---
 gdb/testsuite/gdb.ada/catch_ex.exp            | 78 +++++++++----------
 gdb/testsuite/gdb.ada/catch_ex_std.exp        |  2 +-
 gdb/testsuite/gdb.ada/char_enum.exp           |  2 +-
 gdb/testsuite/gdb.ada/char_enum_overload.exp  |  2 +-
 gdb/testsuite/gdb.ada/char_enum_unicode.exp   |  2 +-
 gdb/testsuite/gdb.ada/char_param.exp          | 22 +++---
 gdb/testsuite/gdb.ada/complete.exp            | 54 ++++++-------
 gdb/testsuite/gdb.ada/cond_lang.exp           |  8 +-
 gdb/testsuite/gdb.ada/convvar_comp.exp        |  4 +-
 gdb/testsuite/gdb.ada/dgopt.exp               |  2 +-
 gdb/testsuite/gdb.ada/disc_arr_bound.exp      |  8 +-
 gdb/testsuite/gdb.ada/discrete-char.exp       |  2 +-
 gdb/testsuite/gdb.ada/dot_all.exp             |  4 +-
 gdb/testsuite/gdb.ada/dyn_arrayidx.exp        |  2 +-
 gdb/testsuite/gdb.ada/dyn_loc.exp             |  4 +-
 gdb/testsuite/gdb.ada/dyn_stride.exp          | 14 ++--
 gdb/testsuite/gdb.ada/dynamic-iface.exp       |  2 +-
 gdb/testsuite/gdb.ada/enums_overload.exp      |  2 +-
 gdb/testsuite/gdb.ada/excep_handle.exp        | 30 +++----
 gdb/testsuite/gdb.ada/exec_changed.exp        |  8 +-
 gdb/testsuite/gdb.ada/expr_delims.exp         | 24 +++---
 gdb/testsuite/gdb.ada/expr_with_funcall.exp   |  2 +-
 gdb/testsuite/gdb.ada/exprs.exp               |  2 +-
 gdb/testsuite/gdb.ada/extended-access.exp     |  2 +-
 gdb/testsuite/gdb.ada/fin_fun_out.exp         |  6 +-
 gdb/testsuite/gdb.ada/finish-large.exp        |  4 +-
 gdb/testsuite/gdb.ada/finish-var-size.exp     |  4 +-
 gdb/testsuite/gdb.ada/fixed_cmp.exp           | 10 +--
 .../gdb.ada/fixed_points_function.exp         |  6 +-
 gdb/testsuite/gdb.ada/float_param.exp         |  6 +-
 gdb/testsuite/gdb.ada/frame_args.exp          | 10 +--
 gdb/testsuite/gdb.ada/fullname_bp.exp         | 10 +--
 gdb/testsuite/gdb.ada/fun_addr.exp            |  4 +-
 gdb/testsuite/gdb.ada/fun_in_declare.exp      | 12 +--
 gdb/testsuite/gdb.ada/fun_overload_menu.exp   |  2 +-
 gdb/testsuite/gdb.ada/fun_renaming.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_char.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_param.exp       |  4 +-
 gdb/testsuite/gdb.ada/funcall_ptr.exp         |  6 +-
 gdb/testsuite/gdb.ada/ghost.exp               |  4 +-
 gdb/testsuite/gdb.ada/homonym.exp             | 46 +++++------
 .../gdb.ada/info_addr_mixed_case.exp          |  4 +-
 gdb/testsuite/gdb.ada/info_auto_lang.exp      |  6 +-
 gdb/testsuite/gdb.ada/info_exc.exp            | 22 +++---
 gdb/testsuite/gdb.ada/info_types.exp          |  2 +-
 gdb/testsuite/gdb.ada/int_deref.exp           |  8 +-
 gdb/testsuite/gdb.ada/interface.exp           |  6 +-
 gdb/testsuite/gdb.ada/iwide.exp               | 12 +--
 gdb/testsuite/gdb.ada/lang_switch.exp         | 10 +--
 gdb/testsuite/gdb.ada/length_cond.exp         |  2 +-
 gdb/testsuite/gdb.ada/limited-length.exp      |  4 +-
 gdb/testsuite/gdb.ada/local-enum.exp          |  4 +-
 gdb/testsuite/gdb.ada/maint_with_ada.exp      |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_assert.exp     | 16 ++--
 gdb/testsuite/gdb.ada/mi_catch_ex.exp         | 42 +++++-----
 gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    | 18 ++---
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  4 +-
 gdb/testsuite/gdb.ada/mi_ex_cond.exp          |  6 +-
 gdb/testsuite/gdb.ada/mi_exc_info.exp         | 20 ++---
 gdb/testsuite/gdb.ada/mi_interface.exp        |  4 +-
 gdb/testsuite/gdb.ada/mi_prot.exp             |  2 +-
 gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  4 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp         |  4 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp        | 20 ++---
 gdb/testsuite/gdb.ada/minsyms.exp             | 12 +--
 gdb/testsuite/gdb.ada/n_arr_bound.exp         |  2 +-
 gdb/testsuite/gdb.ada/nested.exp              |  6 +-
 gdb/testsuite/gdb.ada/notcplusplus.exp        | 22 +++---
 gdb/testsuite/gdb.ada/null_array.exp          |  8 +-
 gdb/testsuite/gdb.ada/null_record.exp         |  4 +-
 gdb/testsuite/gdb.ada/operator_bp.exp         | 12 +--
 gdb/testsuite/gdb.ada/optim_drec.exp          |  6 +-
 gdb/testsuite/gdb.ada/packed_array_assign.exp |  2 +-
 gdb/testsuite/gdb.ada/pckd_neg.exp            | 10 +--
 gdb/testsuite/gdb.ada/pkd_arr_elem.exp        | 12 +--
 gdb/testsuite/gdb.ada/pp-rec-component.exp    |  6 +-
 gdb/testsuite/gdb.ada/print_chars.exp         |  8 +-
 gdb/testsuite/gdb.ada/print_pc.exp            |  4 +-
 gdb/testsuite/gdb.ada/ptr_typedef.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_arith_binop.exp   |  6 +-
 gdb/testsuite/gdb.ada/ptype_array.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_field.exp         | 26 +++----
 gdb/testsuite/gdb.ada/ptype_tagged_param.exp  |  4 +-
 gdb/testsuite/gdb.ada/py_range.exp            |  8 +-
 gdb/testsuite/gdb.ada/rdv_wait.exp            |  6 +-
 gdb/testsuite/gdb.ada/rec_comp.exp            |  4 +-
 gdb/testsuite/gdb.ada/rec_return.exp          |  6 +-
 gdb/testsuite/gdb.ada/ref_param.exp           |  8 +-
 gdb/testsuite/gdb.ada/ref_tick_size.exp       |  4 +-
 .../gdb.ada/rename_subscript_param.exp        | 18 ++---
 gdb/testsuite/gdb.ada/repeat_dyn.exp          |  4 +-
 .../gdb.ada/return-small-char-array.exp       |  2 +-
 gdb/testsuite/gdb.ada/same_enum.exp           |  2 +-
 gdb/testsuite/gdb.ada/scalar_storage.exp      |  2 +-
 gdb/testsuite/gdb.ada/scoped_watch.exp        | 22 +++---
 gdb/testsuite/gdb.ada/set_wstr.exp            | 30 +++----
 gdb/testsuite/gdb.ada/small_reg_param.exp     |  4 +-
 gdb/testsuite/gdb.ada/start.exp               |  4 +-
 gdb/testsuite/gdb.ada/static-link.exp         |  2 +-
 gdb/testsuite/gdb.ada/str_binop_equal.exp     |  8 +-
 gdb/testsuite/gdb.ada/str_chars.exp           |  2 +-
 gdb/testsuite/gdb.ada/str_ref_cmp.exp         |  6 +-
 gdb/testsuite/gdb.ada/str_uninit.exp          |  4 +-
 gdb/testsuite/gdb.ada/sub_variant.exp         |  2 +-
 gdb/testsuite/gdb.ada/sym_print_name.exp      | 24 +++---
 gdb/testsuite/gdb.ada/taft_type.exp           |  6 +-
 gdb/testsuite/gdb.ada/tagged-lookup.exp       |  2 +-
 gdb/testsuite/gdb.ada/tagged.exp              | 18 ++---
 gdb/testsuite/gdb.ada/task_bp.exp             | 18 ++---
 gdb/testsuite/gdb.ada/task_switch_in_core.exp | 24 +++---
 gdb/testsuite/gdb.ada/task_watch.exp          |  2 +-
 gdb/testsuite/gdb.ada/tasks.exp               | 34 ++++----
 gdb/testsuite/gdb.ada/tick_last_segv.exp      | 10 +--
 .../gdb.ada/tick_length_array_enum_idx.exp    |  2 +-
 gdb/testsuite/gdb.ada/type_coercion.exp       | 14 ++--
 .../gdb.ada/uninitialized-variable-record.exp |  2 +-
 gdb/testsuite/gdb.ada/uninitialized_vars.exp  |  4 +-
 gdb/testsuite/gdb.ada/unsigned_last.exp       |  2 +-
 gdb/testsuite/gdb.ada/var_arr_attrs.exp       |  2 +-
 gdb/testsuite/gdb.ada/var_arr_typedef.exp     |  8 +-
 gdb/testsuite/gdb.ada/variant-record.exp      |  2 +-
 .../gdb.ada/variant_record_field.exp          |  2 +-
 gdb/testsuite/gdb.ada/varsize_limit.exp       |  4 +-
 gdb/testsuite/gdb.ada/vla.exp                 |  8 +-
 gdb/testsuite/gdb.ada/voidctx.exp             |  2 +-
 gdb/testsuite/gdb.ada/watch_arg.exp           | 12 +--
 gdb/testsuite/gdb.ada/watch_minus_l.exp       |  2 +-
 gdb/testsuite/gdb.ada/whatis_array_val.exp    | 10 +--
 gdb/testsuite/gdb.ada/widewide.exp            |  4 +-
 gdb/testsuite/gdb.ada/win_fu_syms.exp         | 10 +--
 160 files changed, 770 insertions(+), 770 deletions(-)


base-commit: 1f9e31594acb8b04c68383dcc0f3ff843367f318
  

Comments

Tom Tromey Jan. 6, 2026, 6:13 p.m. UTC | #1
>>>>> "Tom" == Tom Tromey <tromey@adacore.com> writes:

Tom> Various gdb.ada tests had incorrect indentation.  This patch reformats
Tom> these.  It was written by script.

I'm checking this in.

Tom
  

Patch

diff --git a/gdb/testsuite/gdb.ada/O2_float_param.exp b/gdb/testsuite/gdb.ada/O2_float_param.exp
index 2a2f1d0b0bd..14e261f2309 100644
--- a/gdb/testsuite/gdb.ada/O2_float_param.exp
+++ b/gdb/testsuite/gdb.ada/O2_float_param.exp
@@ -22,7 +22,7 @@  standard_ada_testfile foo
 set have_xfail 0
 if {[is_aarch64_target]} {
     if { [gnat_version_compare < 9] } {
-       set have_xfail 1
+	set have_xfail 1
     }
 }
 
@@ -47,18 +47,18 @@  foreach_gnat_encoding scenario flags {all minimal} {
     set re \
 	"#0.*callee\\.increment \\(val(=val@entry)?=99\\.0, msg=\\.\\.\\.\\).*"
     set re_different_entry_val \
-       "#0\\s+callee\\.increment \\(val=99.0, val@entry=.*, msg=\\.\\.\\.\\).*"
+	"#0\\s+callee\\.increment \\(val=99.0, val@entry=.*, msg=\\.\\.\\.\\).*"
     gdb_test_multiple "frame" "" {
-       -re -wrap $re {
-	   pass $gdb_test_name
-       }
-       -re -wrap $re_different_entry_val {
-	   if { $have_xfail } {
-	      # GCC PR98148
-	      xfail $gdb_test_name
-	   } else {
-	      fail $gdb_test_name
-	   }
-       }
+	-re -wrap $re {
+	    pass $gdb_test_name
+	}
+	-re -wrap $re_different_entry_val {
+	    if { $have_xfail } {
+		# GCC PR98148
+		xfail $gdb_test_name
+	    } else {
+		fail $gdb_test_name
+	    }
+	}
     }
 }
diff --git a/gdb/testsuite/gdb.ada/access_tagged_param.exp b/gdb/testsuite/gdb.ada/access_tagged_param.exp
index f3722259b43..e0a591de5fc 100644
--- a/gdb/testsuite/gdb.ada/access_tagged_param.exp
+++ b/gdb/testsuite/gdb.ada/access_tagged_param.exp
@@ -23,13 +23,13 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto "foo"]} {
-  return
+    return
 }
 
 gdb_breakpoint "pck.adb:19"
@@ -38,4 +38,4 @@  gdb_breakpoint "pck.adb:19"
 # the value of all the parameters.
 
 gdb_test "continue" \
-	 ".*Breakpoint $decimal, pck\\.inspect \\(obj=$hex, <objL>=\[1-9\]\\) at .*"
+    ".*Breakpoint $decimal, pck\\.inspect \\(obj=$hex, <objL>=\[1-9\]\\) at .*"
diff --git a/gdb/testsuite/gdb.ada/access_to_packed_array.exp b/gdb/testsuite/gdb.ada/access_to_packed_array.exp
index bf750905ea4..c63cf31c416 100644
--- a/gdb/testsuite/gdb.ada/access_to_packed_array.exp
+++ b/gdb/testsuite/gdb.ada/access_to_packed_array.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/addr_arith.exp b/gdb/testsuite/gdb.ada/addr_arith.exp
index cac98e0b636..62d65817a56 100644
--- a/gdb/testsuite/gdb.ada/addr_arith.exp
+++ b/gdb/testsuite/gdb.ada/addr_arith.exp
@@ -20,24 +20,24 @@  require allow_ada_tests
 standard_ada_testfile foo_na07_019
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo_na07_019.adb]
 if {![runto "foo_na07_019.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print something'address + 0" \
-	 "\\(system\\.address\\) $hex <pck\\.something>"
+    "\\(system\\.address\\) $hex <pck\\.something>"
 
 gdb_test "print 0 + something'address" \
-	 "\\(system\\.address\\) $hex <pck\\.something>"
+    "\\(system\\.address\\) $hex <pck\\.something>"
 
 gdb_test "print something'address - 0" \
-	 "\\(system\\.address\\) $hex <pck\\.something>"
+    "\\(system\\.address\\) $hex <pck\\.something>"
 
 gdb_test "print 0 - something'address" \
-	 "\\(system\\.address\\) $hex.*"
+    "\\(system\\.address\\) $hex.*"
diff --git a/gdb/testsuite/gdb.ada/arr_arr.exp b/gdb/testsuite/gdb.ada/arr_arr.exp
index a41d1d46600..80a4aba5de5 100644
--- a/gdb/testsuite/gdb.ada/arr_arr.exp
+++ b/gdb/testsuite/gdb.ada/arr_arr.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 # Accept "foo." prefix for older versions of GNAT.
diff --git a/gdb/testsuite/gdb.ada/array_bounds.exp b/gdb/testsuite/gdb.ada/array_bounds.exp
index 431e6d1d9e4..af31d1c80e8 100644
--- a/gdb/testsuite/gdb.ada/array_bounds.exp
+++ b/gdb/testsuite/gdb.ada/array_bounds.exp
@@ -20,24 +20,24 @@  require allow_ada_tests
 standard_ada_testfile bar
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/bar.adb]
 if {![runto "bar.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print itable'first" \
-	 "= 2"
+    "= 2"
 
 gdb_test "print itable'last" \
-	 "= 5"
+    "= 5"
 
 gdb_test "print table'first" \
-	 "= zero"
+    "= zero"
 
 gdb_test "print table'last" \
-	 "= two"
+    "= two"
diff --git a/gdb/testsuite/gdb.ada/array_char_idx.exp b/gdb/testsuite/gdb.ada/array_char_idx.exp
index 166996fe92d..3a78d73acfa 100644
--- a/gdb/testsuite/gdb.ada/array_char_idx.exp
+++ b/gdb/testsuite/gdb.ada/array_char_idx.exp
@@ -26,12 +26,12 @@  if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 clean_restart ${testfile}
 
 gdb_test "ptype char_table" \
-	 "= array \\(character\\) of natural"
+    "= array \\(character\\) of natural"
 
 gdb_test "ptype global_char_table" \
-	 "= array \\(character\\) of natural"
+    "= array \\(character\\) of natural"
 
 # Some more recent versions of gcc can statically initialize this
 # array, so we allow either 0 or 4874.
 gdb_test "print my_table" "= \\((0|4874) <repeats 256 times>\\)" \
-	 "Display my_table"
+    "Display my_table"
diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp
index 3973f9cf2c4..6b4dc9c82dc 100644
--- a/gdb/testsuite/gdb.ada/array_return.exp
+++ b/gdb/testsuite/gdb.ada/array_return.exp
@@ -34,61 +34,61 @@  clean_restart ${testfile}
 # Start the inferior
 
 if {![runto_main]} {
-   return
+    return
 }
 
 # Create a breakpoint in each function from which we want to test
 # the "finish" command.
 
 gdb_test "break create_small" \
-	 "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
-	 "insert breakpoint in create_small"
+    "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
+    "insert breakpoint in create_small"
 
 gdb_test "break create_large" \
-	 "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
-	 "insert breakpoint in create_large"
+    "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
+    "insert breakpoint in create_large"
 
 gdb_test "break create_small_float_vector" \
-	 "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
-	 "insert breakpoint in create_small_float_vector"
+    "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \
+    "insert breakpoint in create_small_float_vector"
 
 # Then continue until reaching the first breakpoint inside Create_Small,
 # and then do a "finish".
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \
-	 "continuing to Create_Small"
+    "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \
+    "continuing to Create_Small"
 
 gdb_test "finish" \
-	 "Value returned is \\\$\[0-9\]+ = \\(1, 1\\)" \
-	 "value printed by finish of Create_Small"
+    "Value returned is \\\$\[0-9\]+ = \\(1, 1\\)" \
+    "value printed by finish of Create_Small"
 
 # Now continue until reaching the second breakpoint inside Create_Large,
 # and then do another "finish".
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+, pck.create_large \\(\\).*" \
-	 "continuing to Create_Large"
+    "Breakpoint \[0-9\]+, pck.create_large \\(\\).*" \
+    "continuing to Create_Large"
 
 # On hppa32, the value returned is too large to be returned via a register.
 # Instead, it is returned using the struct convention, and the debugger
 # unfortunately cannot find the address of the result.  The following
 # test is therefore expected to fail for all hppa targets except hppa64.
 if {![istarget "hppa*64*-*-*"]} {
-  setup_xfail "hppa*-*-*"
+    setup_xfail "hppa*-*-*"
 }
 
 gdb_test "finish" \
-	 "Value returned is \\\$\[0-9\]+ = \\(2, 2, 2, 2\\)" \
-	 "value printed by finish of Create_Large"
+    "Value returned is \\\$\[0-9\]+ = \\(2, 2, 2, 2\\)" \
+    "value printed by finish of Create_Large"
 
 # Now continue until reaching the third breakpoint, and then do another
 # "finish" again.
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+, pck.create_small_float_vector \\(\\).*" \
-	 "continuing to Create_Small_Float_Vector"
+    "Breakpoint \[0-9\]+, pck.create_small_float_vector \\(\\).*" \
+    "continuing to Create_Small_Float_Vector"
 
 gdb_test "finish" \
-	 "Value returned is \\\$\[0-9\]+ = \\(4.25, 4.25\\)" \
-	 "value printed by finish of Create_Small_Float_Vector"
+    "Value returned is \\\$\[0-9\]+ = \\(4.25, 4.25\\)" \
+    "value printed by finish of Create_Small_Float_Vector"
diff --git a/gdb/testsuite/gdb.ada/array_subscript_addr.exp b/gdb/testsuite/gdb.ada/array_subscript_addr.exp
index a07992c3ff7..8e02796eec6 100644
--- a/gdb/testsuite/gdb.ada/array_subscript_addr.exp
+++ b/gdb/testsuite/gdb.ada/array_subscript_addr.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,4 +31,4 @@  runto "p.adb:$bp_location"
 # Verify that we can compare a string slice with another string.
 
 gdb_test "print a(2)'Address" \
-	 "= \\(system\\.address\\) 0x\[0-9a-fA-F\]+"
+    "= \\(system\\.address\\) 0x\[0-9a-fA-F\]+"
diff --git a/gdb/testsuite/gdb.ada/arraydim.exp b/gdb/testsuite/gdb.ada/arraydim.exp
index e8f0b40e0da..111010b9718 100644
--- a/gdb/testsuite/gdb.ada/arraydim.exp
+++ b/gdb/testsuite/gdb.ada/arraydim.exp
@@ -25,7 +25,7 @@  set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,7 +34,7 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "ptype m" \
-	 "array \\(1 \\.\\. 1, 2 \\.\\. 3, 4 \\.\\. 6\\) of integer"
+    "array \\(1 \\.\\. 1, 2 \\.\\. 3, 4 \\.\\. 6\\) of integer"
 
 gdb_test "print m'first" " = 1"
 gdb_test "print m'last" " = 1"
@@ -53,7 +53,7 @@  gdb_test "print m'last(3)" " = 6"
 gdb_test "print m'length(3)" " = 3"
 
 gdb_test "ptype global_3dim_for_gdb_testing" \
-	 "array \\(0 \\.\\. 0, 0 \\.\\. 1, 0 \\.\\. 2\\) of int"
+    "array \\(0 \\.\\. 0, 0 \\.\\. 1, 0 \\.\\. 2\\) of int"
 
 gdb_test "print global_3dim_for_gdb_testing'first" " = 0"
 gdb_test "print global_3dim_for_gdb_testing'last" " = 0"
diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp
index 74620277fbb..289e252c0ea 100644
--- a/gdb/testsuite/gdb.ada/arrayidx.exp
+++ b/gdb/testsuite/gdb.ada/arrayidx.exp
@@ -38,45 +38,45 @@  if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print one_two_three" \
-	 "= \\(1, 2, 3\\)" \
-	 "print one_two_three, indexes off"
+    "= \\(1, 2, 3\\)" \
+    "print one_two_three, indexes off"
 
 gdb_test "print e_one_two_three" \
-	 "= \\(1, 2, 3\\)" \
-	 "print e_one_two_three, indexes off"
+    "= \\(1, 2, 3\\)" \
+    "print e_one_two_three, indexes off"
 
 gdb_test "print r_two_three" \
-	 "= \\(two => 2, 3\\)" \
-	 "print r_two_three, indexes off"
+    "= \\(two => 2, 3\\)" \
+    "print r_two_three, indexes off"
 
 gdb_test "print u_one_two_three" \
-	 "= \\(1, 2, 3\\)" \
-	 "print u_one_two_three, indexes off"
+    "= \\(1, 2, 3\\)" \
+    "print u_one_two_three, indexes off"
 
 gdb_test "print p_one_two_three" \
-	 "= \\(false, true, true\\)" \
-	 "print p_one_two_three, indexes off"
+    "= \\(false, true, true\\)" \
+    "print p_one_two_three, indexes off"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print few_reps" \
-	 "= \\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \
-	 "print few_reps, indexes off"
+    "= \\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \
+    "print few_reps, indexes off"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print many_reps" \
-	 "= \\(1, 2, 3 <repeats 12 times>, 4, 5\\)" \
-	 "print many_reps, indexes off"
+    "= \\(1, 2, 3 <repeats 12 times>, 4, 5\\)" \
+    "print many_reps, indexes off"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print empty" \
-	 "= \\(\\)" \
-	 "print empty, indexes off"
+    "= \\(\\)" \
+    "print empty, indexes off"
 
 # Next, print all the arrays with the indexes
 
@@ -86,34 +86,34 @@  if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print one_two_three" \
-	 "= \\(1 => 1, 2 => 2, 3 => 3\\)"
+    "= \\(1 => 1, 2 => 2, 3 => 3\\)"
 
 gdb_test "print e_one_two_three" \
-	 "= \\(one => 1, two => 2, three => 3\\)"
+    "= \\(one => 1, two => 2, three => 3\\)"
 
 gdb_test "print r_two_three" \
-	 "= \\(two => 2, three => 3\\)"
+    "= \\(two => 2, three => 3\\)"
 
 gdb_test "print u_one_two_three" \
-	 "= \\(1 => 1, 2 => 2, 3 => 3\\)"
+    "= \\(1 => 1, 2 => 2, 3 => 3\\)"
 
 gdb_test "print p_one_two_three" \
-	 "= \\(one => false, two => true, three => true\\)"
+    "= \\(one => false, two => true, three => true\\)"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print few_reps" \
-	 "= \\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)"
+    "= \\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print many_reps" \
-	 "= \\(1 => 1, 2 => 2, 3 => 3 <repeats 12 times>, 15 => 4, 16 => 5\\)"
+    "= \\(1 => 1, 2 => 2, 3 => 3 <repeats 12 times>, 15 => 4, 16 => 5\\)"
 
 if {$old_gcc} {
     setup_xfail "*-*-*"
 }
 gdb_test "print empty" \
-	 "= \\(\\)"
+    "= \\(\\)"
diff --git a/gdb/testsuite/gdb.ada/assign_1.exp b/gdb/testsuite/gdb.ada/assign_1.exp
index 2339beb28f6..dbe4d2c8f23 100644
--- a/gdb/testsuite/gdb.ada/assign_1.exp
+++ b/gdb/testsuite/gdb.ada/assign_1.exp
@@ -22,11 +22,11 @@  clean_restart
 # Force the language to Ada, as this will not happen automatically
 # in this case (no test program).
 gdb_test_no_output "set lang ada" \
-	 "changing the language to ada"
+    "changing the language to ada"
 
 gdb_test "print \$xxx := 1" \
-	 "= 1" \
-	 "set convenience variable \$xxx to 1"
+    "= 1" \
+    "set convenience variable \$xxx to 1"
 
 
 gdb_test "print \$xxx := @ + 23 + @" \
diff --git a/gdb/testsuite/gdb.ada/assign_arr.exp b/gdb/testsuite/gdb.ada/assign_arr.exp
index 87ec190a649..28b68a5a325 100644
--- a/gdb/testsuite/gdb.ada/assign_arr.exp
+++ b/gdb/testsuite/gdb.ada/assign_arr.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile main_p324_051
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,10 +29,10 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/main_p324_051.adb]
 runto "main_p324_051.adb:$bp_location"
 
 gdb_test "print assign_arr_input.u2 :=(0.25,0.5,0.75)" \
-	 " = \\(0\\.25, 0\\.5, 0\\.75\\)"
+    " = \\(0\\.25, 0\\.5, 0\\.75\\)"
 
 gdb_test "print assign_arr_input.u2 :=(0.25, others => 0.125)" \
-	 " = \\(0\\.25, 0\\.125, 0\\.125\\)"
+    " = \\(0\\.25, 0\\.125, 0\\.125\\)"
 
 set line [gdb_get_line_number "STOP2" ${testdir}/target_wrapper.adb]
 gdb_breakpoint target_wrapper.adb:$line
diff --git a/gdb/testsuite/gdb.ada/assoc.exp b/gdb/testsuite/gdb.ada/assoc.exp
index b2a464e0469..caa41d23a48 100644
--- a/gdb/testsuite/gdb.ada/assoc.exp
+++ b/gdb/testsuite/gdb.ada/assoc.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile main
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/atomic_enum.exp b/gdb/testsuite/gdb.ada/atomic_enum.exp
index 22b0f8709a4..28d5f08020f 100644
--- a/gdb/testsuite/gdb.ada/atomic_enum.exp
+++ b/gdb/testsuite/gdb.ada/atomic_enum.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,9 +29,9 @@  set test "ptype pck.data_flag"
 gdb_test_multiple "$test" $test {
     -re "type = \\(one, two, three\\).*$gdb_prompt $" {
 	pass $test
-	}
+    }
     -re "type = \\(\\).*$gdb_prompt $" {
 	# This is a known compiler problem with Stabs.
 	xfail $test
-	}
+    }
 }
diff --git a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
index 4ea55fc5858..5c567b35277 100644
--- a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
+++ b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile "foo"
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -39,7 +39,7 @@  with_test_prefix "run" {
 }
 
 gdb_test "continue" \
-	 ".*Breakpoint \[0-9\]+, foo\\.p \\(s=.*\\) at .*foo.adb:\[0-9\]+.*"
+    ".*Breakpoint \[0-9\]+, foo\\.p \\(s=.*\\) at .*foo.adb:\[0-9\]+.*"
 
 with_test_prefix "cont" {
     gdb_test "print s'first" " = 4"
diff --git a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
index 96fa3350d45..9bc094d817a 100644
--- a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
+++ b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,17 +34,17 @@  runto "foo.adb:$bp_location"
 # report an error.  Try various weird combinations too.
 
 gdb_test "break *break_me'address TASK 2" \
-	 "Garbage 'TASK 2' at end of command"
+    "Garbage 'TASK 2' at end of command"
 
 set test "break *break_me'address TASK Task TaSK 2"
 gdb_test_multiple "$test" $test {
     -re "Garbage 'TASK Task TaSK 2' at end of command\[\r\n\]+$gdb_prompt $" {
 	pass $test
-	}
+    }
     -re "Garbage 'TaSK 2' at end of command\[\r\n\]+$gdb_prompt $" {
 	kfail gdb/14111 "$test"
-	}
+    }
 }
 
 gdb_test "break *break_me'address TASK if" \
-	 "Garbage 'TASK if' at end of command"
+    "Garbage 'TASK if' at end of command"
diff --git a/gdb/testsuite/gdb.ada/big_packed_array.exp b/gdb/testsuite/gdb.ada/big_packed_array.exp
index fbc20d58d72..8ac260161ac 100644
--- a/gdb/testsuite/gdb.ada/big_packed_array.exp
+++ b/gdb/testsuite/gdb.ada/big_packed_array.exp
@@ -44,29 +44,29 @@  foreach_gnat_encoding scenario flags {all minimal} {
     set re_xfail "= \\(0 => 0 <repeats 25 times>\\)"
     set re_xfail2 "= \\(0 => 0 <repeats 24 times>, ($decimal)\\)"
     gdb_test_multiple "print bad" "" {
-       -re -wrap $re  {
-	   pass $gdb_test_name
-       }
-       -re -wrap $re_xfail {
-	   if { $have_xfail } {
-	       # gcc/101643
-	       setup_xfail *-*-*
-	   }
-	   fail $gdb_test_name
-       }
-       -re -wrap $re_xfail2 {
-	   set last $expect_out(1,string)
-	   if { $endian == "little" } {
-	       set mask 0x0f
-	   } else {
-	       set mask 0xf0
-	   }
-	   if { $have_xfail && [string is integer $last] \
-		    && [expr ($last & $mask) == 0] } {
-	       # gcc/101643
-	       setup_xfail *-*-*
-	   }
-	   fail $gdb_test_name
-       }
+	-re -wrap $re  {
+	    pass $gdb_test_name
+	}
+	-re -wrap $re_xfail {
+	    if { $have_xfail } {
+		# gcc/101643
+		setup_xfail *-*-*
+	    }
+	    fail $gdb_test_name
+	}
+	-re -wrap $re_xfail2 {
+	    set last $expect_out(1,string)
+	    if { $endian == "little" } {
+		set mask 0x0f
+	    } else {
+		set mask 0xf0
+	    }
+	    if { $have_xfail && [string is integer $last] \
+		     && [expr ($last & $mask) == 0] } {
+		# gcc/101643
+		setup_xfail *-*-*
+	    }
+	    fail $gdb_test_name
+	}
     }
 }
diff --git a/gdb/testsuite/gdb.ada/boolean_expr.exp b/gdb/testsuite/gdb.ada/boolean_expr.exp
index 9d52db7fc5e..4f04125c954 100644
--- a/gdb/testsuite/gdb.ada/boolean_expr.exp
+++ b/gdb/testsuite/gdb.ada/boolean_expr.exp
@@ -25,10 +25,10 @@  set any_addr "0x\[0-9a-zA-Z\]+"
 # Force the language to Ada, as this will not happen automatically
 # in this case (no test program).
 gdb_test_no_output "set lang ada" \
-	 "changing the language to ada"
+    "changing the language to ada"
 
 gdb_test "print 1 = 2" \
-	 "= false"
+    "= false"
 
 gdb_test "print 3 = 3" \
-	 "= true"
+    "= true"
diff --git a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
index 288ed29a958..77943b0bc2e 100644
--- a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
+++ b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
@@ -41,65 +41,65 @@  set options [list debug \
 		 additional_flags=${cobject2} \
 		 additional_flags=-margs]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto "foo_h731_021"]} {
-  return
+    return
 }
 
 # Verify that the current language is Ada.
 gdb_test "show lang" \
-	 "\"auto; currently ada\"\\."
+    "\"auto; currently ada\"\\."
 
 # Before running to the C function (and thus switching out of Ada
 # mode), try printing the function using the "<...>" notation.
 gdb_test "p <MixedCaseFunc>" \
-	 " = void" \
-	 "p <MixedCaseFunc>, in Ada"
+    " = void" \
+    "p <MixedCaseFunc>, in Ada"
 
 gdb_test "p <NoDebugMixedCaseFunc>" \
-	 " = {<text variable, no debug info>} $hex <NoDebugMixedCaseFunc>" \
-	 "p <NoDebugMixedCaseFunc>, in Ada"
+    " = {<text variable, no debug info>} $hex <NoDebugMixedCaseFunc>" \
+    "p <NoDebugMixedCaseFunc>, in Ada"
 
 # Try inserting a breakpoint inside a C function. Because the function's
 # name has some uppercase letters, we need to use the "<...>" notation.
 # The purpose of this testcase is to verify that we can in fact do so
 # and that it inserts the breakpoint at the expected location.
 gdb_test "break <MixedCaseFunc>" \
-	 "Breakpoint $decimal at $hex: file .*bar.c, line $decimal\\."
+    "Breakpoint $decimal at $hex: file .*bar.c, line $decimal\\."
 
 # Same, but this time on the function with no debug info.
 gdb_test "break <NoDebugMixedCaseFunc>" \
-	 "Breakpoint $decimal at $hex"
+    "Breakpoint $decimal at $hex"
 
 # Resume the program's execution, verifying that it lands at the expected
 # location.
 gdb_test "continue" \
-	 "Breakpoint $decimal, MixedCaseFunc \\(\\) at .*bar\\.c:$decimal.*"
+    "Breakpoint $decimal, MixedCaseFunc \\(\\) at .*bar\\.c:$decimal.*"
 
 # Try printing again using the "<...>" notation.  This shouldn't work
 # now, since the current frame is a C function.
 gdb_test "p <MixedCaseFunc>" \
-	 "A syntax error in expression, near `<MixedCaseFunc>'\\." \
-	 "p <MixedCaseFunc>, in C"
+    "A syntax error in expression, near `<MixedCaseFunc>'\\." \
+    "p <MixedCaseFunc>, in C"
 
 gdb_test "p <NoDebugMixedCaseFunc>" \
-	 "A syntax error in expression, near `<NoDebugMixedCaseFunc>'\\." \
-	 "p <NoDebugMixedCaseFunc>, in C"
+    "A syntax error in expression, near `<NoDebugMixedCaseFunc>'\\." \
+    "p <NoDebugMixedCaseFunc>, in C"
 
 set test "break <MixedCaseFunc>, in C"
 gdb_test_multiple "break <MixedCaseFunc>" $test {
-	-re "Function \"<MixedCaseFunc>\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
-		gdb_test_no_output "n" $test
-	}
+    -re "Function \"<MixedCaseFunc>\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
+	gdb_test_no_output "n" $test
+    }
 }
 
 set test "break <NoDebugMixedCaseFunc>, in C"
 gdb_test_multiple "break <NoDebugMixedCaseFunc>" $test {
-	-re "Function \"<NoDebugMixedCaseFunc>\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
-		gdb_test_no_output "n" $test
-	}
+    -re "Function \"<NoDebugMixedCaseFunc>\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
+	gdb_test_no_output "n" $test
+    }
 }
diff --git a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
index d104ae48921..cb4c5cf8dae 100644
--- a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
+++ b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 # Force GDB to convert the psymtab of pck.adb into a symtab.
 gdb_test "list pck.adb:1" \
-	 "$decimal\[ \t\]+--  Copyright.*"
+    "$decimal\[ \t\]+--  Copyright.*"
 
 # Break on subprogram "Archive". There is an enumeral that's an
 # homonym, so verify that GDB doesn't provide the choice between
@@ -35,7 +35,7 @@  gdb_test "list pck.adb:1" \
 # Instead, it should insert the breakpoint on the function alone.
 
 gdb_test "break archive" \
-	 "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\."
+    "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\."
 
 # Run the program. Make sure the program runs until it hits
 # the breakpoint and that the debugger does not unexpectedly ask
@@ -45,5 +45,5 @@  gdb_test "break archive" \
 
 gdb_run_cmd
 gdb_test "" \
-	 "Breakpoint $decimal, pck\\.archive \\(\\).*" \
-	 "run to pck.archive breakpoint"
+    "Breakpoint $decimal, pck\\.archive \\(\\).*" \
+    "run to pck.archive breakpoint"
diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr.exp b/gdb/testsuite/gdb.ada/bp_fun_addr.exp
index be67a2a1d45..71230c90465 100644
--- a/gdb/testsuite/gdb.ada/bp_fun_addr.exp
+++ b/gdb/testsuite/gdb.ada/bp_fun_addr.exp
@@ -26,9 +26,9 @@  if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 clean_restart ${testfile}
 
 gdb_test "break *bp_fun_addr'address" \
-	 "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+."
 
 gdb_run_cmd
 gdb_test "" \
-	 "Breakpoint $decimal, bp_fun_addr \\(\\).*" \
-	 "run until breakpoint at bp_fun_addr'address"
+    "Breakpoint $decimal, bp_fun_addr \\(\\).*" \
+    "run until breakpoint at bp_fun_addr'address"
diff --git a/gdb/testsuite/gdb.ada/bp_inlined_func.exp b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
index 8b05a428a78..cd033a31fb5 100644
--- a/gdb/testsuite/gdb.ada/bp_inlined_func.exp
+++ b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
@@ -20,21 +20,21 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-   return
+    return
 }
 
 # Check that inserting breakpoint on read_small inlined function inserts
 # 4 breakpoints (or possibly 5, including the read_small function itself).
 
 gdb_test "break read_small" \
-	 "Breakpoint $decimal at $hex: read_small\\. \\(\[45\] locations\\)" \
-	 "set breakpoint at read_small"
+    "Breakpoint $decimal at $hex: read_small\\. \\(\[45\] locations\\)" \
+    "set breakpoint at read_small"
 
 # We do not verify each breakpoint info, but use continue commands instead
 # to verify that we properly stop on each expected breakpoint.
@@ -50,5 +50,5 @@  for {set i 0} {$i < 4} {incr i} {
 }
 
 gdb_test "continue" \
-	 "Continuing\\..*$inferior_exited_re.*" \
-	 "continuing to program completion"
+    "Continuing\\..*$inferior_exited_re.*" \
+    "continuing to program completion"
diff --git a/gdb/testsuite/gdb.ada/bp_on_var.exp b/gdb/testsuite/gdb.ada/bp_on_var.exp
index 0b5e6a1a0a6..17bf481bc80 100644
--- a/gdb/testsuite/gdb.ada/bp_on_var.exp
+++ b/gdb/testsuite/gdb.ada/bp_on_var.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 # Test inserting breakpoint on pck.my_global_variable.
@@ -33,7 +33,7 @@  clean_restart ${testfile}
 gdb_test_no_output "set breakpoint pending off" "disable pending breakpoints"
 
 gdb_test "break pck.my_global_variable" \
-	 "Function \"pck\\.my_global_variable\" not defined\\."
+    "Function \"pck\\.my_global_variable\" not defined\\."
 
 
 # Test inserting breakpoint on pck.my_hidden_variable.
@@ -44,4 +44,4 @@  gdb_test_no_output "set breakpoint pending off" \
     "disable pending breakpoints after restart"
 
 gdb_test "break pck.my_hidden_variable" \
-	 "Function \"pck\\.my_hidden_variable\" not defined\\."
+    "Function \"pck\\.my_hidden_variable\" not defined\\."
diff --git a/gdb/testsuite/gdb.ada/bp_range_type.exp b/gdb/testsuite/gdb.ada/bp_range_type.exp
index ba16fe23235..14d84d1ef4a 100644
--- a/gdb/testsuite/gdb.ada/bp_range_type.exp
+++ b/gdb/testsuite/gdb.ada/bp_range_type.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -28,12 +28,12 @@  clean_restart ${testfile}
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 
 gdb_test "break foo.adb:$bp_location if small_value > 20" \
-	 "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\."
+    "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\."
 
 gdb_run_cmd
 gdb_test "" \
-	 "Breakpoint $decimal, foo \\(\\).*" \
-	 "run to breakpoint"
+    "Breakpoint $decimal, foo \\(\\).*" \
+    "run to breakpoint"
 
 # Verify that we stopped at the correct iteration.
 gdb_test "print small_value" " = 25"
diff --git a/gdb/testsuite/gdb.ada/bp_reset.exp b/gdb/testsuite/gdb.ada/bp_reset.exp
index d5441debf6e..fe742cba7a1 100644
--- a/gdb/testsuite/gdb.ada/bp_reset.exp
+++ b/gdb/testsuite/gdb.ada/bp_reset.exp
@@ -20,16 +20,16 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 gdb_test "break nested_sub" \
-	 "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\."
+    "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\."
 
 gdb_test "break do_nothing" \
-	 "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\."
+    "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\."
 
 # Run the program. Make sure the program runs until it hits
 # the first breakpoint inside nested_sub.
diff --git a/gdb/testsuite/gdb.ada/break-label.exp b/gdb/testsuite/gdb.ada/break-label.exp
index 22fa95978e7..b1272f9856e 100644
--- a/gdb/testsuite/gdb.ada/break-label.exp
+++ b/gdb/testsuite/gdb.ada/break-label.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile proc
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
-  return
+    return
 }
 
 # Ada is case-insensitive, so both of these should work.
diff --git a/gdb/testsuite/gdb.ada/byte_packed_arr.exp b/gdb/testsuite/gdb.ada/byte_packed_arr.exp
index 6014c0864b0..b3455534d4b 100644
--- a/gdb/testsuite/gdb.ada/byte_packed_arr.exp
+++ b/gdb/testsuite/gdb.ada/byte_packed_arr.exp
@@ -29,4 +29,4 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/reprod.adb]
 runto "reprod.adb:$bp_location"
 
 gdb_test "print broken" \
-	 " = \\(len => 1, data => \\(\\(i => 1\\)\\)\\)"
+    " = \\(len => 1, data => \\(\\(i => 1\\)\\)\\)"
diff --git a/gdb/testsuite/gdb.ada/call_pn.exp b/gdb/testsuite/gdb.ada/call_pn.exp
index 13a6211e5b7..919a2595d5c 100644
--- a/gdb/testsuite/gdb.ada/call_pn.exp
+++ b/gdb/testsuite/gdb.ada/call_pn.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 # The xfail mentioned below triggers for the "after" print, but may not
diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp
index 443a90fc09e..5c101505ef9 100644
--- a/gdb/testsuite/gdb.ada/catch_assert_if.exp
+++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile bla
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-   return
+    return
 }
 
 clean_restart ${testfile}
@@ -35,12 +35,12 @@  set sp "\[ \t\]*"
 #  - continue, the program exits.
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "catch assert if Global_Var = 2" \
-	 "Catchpoint $decimal: failed Ada assertions" \
-	 "insert catchpoint on failed assertions with condition"
+    "Catchpoint $decimal: failed Ada assertions" \
+    "insert catchpoint on failed assertions with condition"
 
 # Check that condition is stored and properly displayed.
 
@@ -50,11 +50,11 @@  gdb_test "info breakpoint" $exp_bp "Check catch assertions with condition"
 set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb]
 
 set catchpoint_msg \
-  "Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location"
+    "Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*STOP" \
-	 "continuing to expected failed assertion"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*STOP" \
+    "continuing to expected failed assertion"
 
 gdb_test "continue" \
-	 "Continuing\\..*$inferior_exited_re.*" \
-	 "continuing to program completion"
+    "Continuing\\..*$inferior_exited_re.*" \
+    "continuing to program completion"
diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index 8ea718e4eaf..da69408ad6b 100644
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,14 +34,14 @@  set sp "\[ \t\]*"
 
 set info_break_header "Num${sp}Type${sp}Disp${sp}Enb${sp}Address${sp}What"
 set catch_exception_info \
-  "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}all Ada exceptions"
+    "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}all Ada exceptions"
 
 ####################################
 # 1. Try catching all exceptions.  #
 ####################################
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "catch exception" \
@@ -49,20 +49,20 @@  gdb_test "catch exception" \
     "insert catchpoint on all Ada exceptions"
 
 gdb_test "info break" \
-	 "$info_break_header$eol.*$catch_exception_info" \
-	 "info break, catch all Ada exceptions"
+    "$info_break_header$eol.*$catch_exception_info" \
+    "info break, catch all Ada exceptions"
 
 set catchpoint_msg \
-  "Catchpoint $any_nb, CONSTRAINT_ERROR (\\\(ignore C_E\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Catchpoint $any_nb, CONSTRAINT_ERROR (\\\(ignore C_E\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT1" \
-	 "continuing to first exception"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT1" \
+    "continuing to first exception"
 
 set catchpoint_msg \
-  "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo\\.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo\\.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \
-	 "continuing to second exception"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \
+    "continuing to second exception"
 
 ################################################
 # 2. Try catching only some of the exceptions. #
@@ -79,53 +79,53 @@  gdb_test "continue" \
 #  - continue, the program exits.
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "catch exception Program_Error" \
-	 "Catchpoint $any_nb: \`Program_Error' Ada exception" \
-	 "insert catchpoint on Program_Error"
+    "Catchpoint $any_nb: \`Program_Error' Ada exception" \
+    "insert catchpoint on Program_Error"
 
 gdb_test "catch assert" \
-	 "Catchpoint $any_nb: failed Ada assertions" \
-	 "insert catchpoint on failed assertions"
+    "Catchpoint $any_nb: failed Ada assertions" \
+    "insert catchpoint on failed assertions"
 
 gdb_test "catch exception unhandled" \
-	 "Catchpoint $any_nb: unhandled Ada exceptions" \
-	 "insert catchpoint on unhandled exceptions"
+    "Catchpoint $any_nb: unhandled Ada exceptions" \
+    "insert catchpoint on unhandled exceptions"
 
 set catch_exception_entry \
-  "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}\`Program_Error' Ada exception"
+    "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}\`Program_Error' Ada exception"
 set catch_assert_entry \
-  "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}failed Ada assertions"
+    "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}failed Ada assertions"
 set catch_unhandled_entry \
-  "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}unhandled Ada exceptions"
+    "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}unhandled Ada exceptions"
 
 gdb_test "info break" \
-	 "$info_break_header$eol.*$catch_exception_entry$eol$catch_assert_entry$eol$catch_unhandled_entry" \
-	 "info break, second run"
+    "$info_break_header$eol.*$catch_exception_entry$eol$catch_assert_entry$eol$catch_unhandled_entry" \
+    "info break, second run"
 
 set catchpoint_msg \
-  "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \
-	 "continuing to Program_Error exception"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \
+    "continuing to Program_Error exception"
 
 set catchpoint_msg \
-  "Catchpoint $any_nb, failed assertion at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Catchpoint $any_nb, failed assertion at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT3" \
-	 "continuing to failed assertion"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT3" \
+    "continuing to failed assertion"
 
 set catchpoint_msg \
-  "Catchpoint $any_nb, unhandled CONSTRAINT_ERROR at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Catchpoint $any_nb, unhandled CONSTRAINT_ERROR at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT4" \
-	 "continuing to unhandled exception"
+    "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT4" \
+    "continuing to unhandled exception"
 
 gdb_test "continue" \
-	 "Continuing\\..*$inferior_exited_re.*" \
-	 "continuing to program completion"
+    "Continuing\\..*$inferior_exited_re.*" \
+    "continuing to program completion"
 
 #################################
 # 3. Try temporary catchpoints. #
@@ -139,17 +139,17 @@  gdb_test "continue" \
 #     the program.
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "tcatch exception" \
-	 "Temporary catchpoint $any_nb: all Ada exceptions"
+    "Temporary catchpoint $any_nb: all Ada exceptions"
 
 set temp_catchpoint_msg \
-  "Temporary catchpoint $any_nb, CONSTRAINT_ERROR (\\\(.*\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
+    "Temporary catchpoint $any_nb, CONSTRAINT_ERROR (\\\(.*\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb"
 gdb_test "continue" \
-	 "Continuing\\.$eol$eol$temp_catchpoint_msg$eol.*SPOT1" \
-	 "continuing to temporary catchpoint"
+    "Continuing\\.$eol$eol$temp_catchpoint_msg$eol.*SPOT1" \
+    "continuing to temporary catchpoint"
 
 with_test_prefix "temporary catchpoint" {
     gdb_test "continue" \
diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp
index d1f17f872f3..fcf2cd79672 100644
--- a/gdb/testsuite/gdb.ada/catch_ex_std.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp
@@ -66,7 +66,7 @@  clean_restart ${testfile}
 gdb_load_shlib $sofile
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "catch exception some_kind_of_error" \
diff --git a/gdb/testsuite/gdb.ada/char_enum.exp b/gdb/testsuite/gdb.ada/char_enum.exp
index 6fbfb7b8be8..8b6f9438c15 100644
--- a/gdb/testsuite/gdb.ada/char_enum.exp
+++ b/gdb/testsuite/gdb.ada/char_enum.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/char_enum_overload.exp b/gdb/testsuite/gdb.ada/char_enum_overload.exp
index 8a8cc5adcdf..eb940c20e7a 100644
--- a/gdb/testsuite/gdb.ada/char_enum_overload.exp
+++ b/gdb/testsuite/gdb.ada/char_enum_overload.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/char_enum_unicode.exp b/gdb/testsuite/gdb.ada/char_enum_unicode.exp
index 33e5aebcf1c..5e23218778a 100644
--- a/gdb/testsuite/gdb.ada/char_enum_unicode.exp
+++ b/gdb/testsuite/gdb.ada/char_enum_unicode.exp
@@ -21,7 +21,7 @@  standard_ada_testfile foo
 
 set flags [list debug additional_flags=-gnatW8]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/char_param.exp b/gdb/testsuite/gdb.ada/char_param.exp
index b33d8201411..966e2350050 100644
--- a/gdb/testsuite/gdb.ada/char_param.exp
+++ b/gdb/testsuite/gdb.ada/char_param.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,21 +34,21 @@  runto "foo.adb:$bp_location"
 # the function call.
 
 gdb_test "print procedure_result" \
-	 "= 32 ' '"  \
-	 "print procedure_result before calling same"
+    "= 32 ' '"  \
+    "print procedure_result before calling same"
 
 gdb_test "call same (first)" \
-	 "" \
-	 "call same"
+    "" \
+    "call same"
 
 gdb_test "print procedure_result" \
-	 "= 97 'a'"  \
-	 "print procedure_result after calling same"
+    "= 97 'a'"  \
+    "print procedure_result after calling same"
 
 gdb_test "call next (first)" \
-	 "= 98 'b'" \
-	 "call next"
+    "= 98 'b'" \
+    "call next"
 
 gdb_test "print procedure_result" \
-	 "= 98 'b'"  \
-	 "print procedure_result after calling next"
+    "= 98 'b'"  \
+    "print procedure_result after calling next"
diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp
index 725f06bbb39..4f074806e79 100644
--- a/gdb/testsuite/gdb.ada/complete.exp
+++ b/gdb/testsuite/gdb.ada/complete.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -50,7 +50,7 @@  proc test_gdb_complete { expr expected_output {msg ""} } {
 	set msg $cmd
     }
     gdb_test "complete p $expr" \
-	     "$expected_output" $msg
+	"$expected_output" $msg
 }
 
 # A convenience function that verifies that the "complete EXPR" command
@@ -63,12 +63,12 @@  proc test_gdb_no_completion { expr } {
 # Try a global variable, only one match should be found:
 
 test_gdb_complete "my_glob" \
-		  "p my_global_variable"
+    "p my_global_variable"
 
 # A global variable, inside a nested package:
 
 test_gdb_complete "insi" \
-		  "p inside_variable"
+    "p inside_variable"
 
 # A global variable inside a nested package, but only giving part of
 # the fully qualified name (top level package name missing):
@@ -77,16 +77,16 @@  test_gdb_no_completion "inner.insi"
 
 # An incomplete nested package name, were lies a single symbol:
 test_gdb_complete "pck.inne" \
-		  "p pck.inner.inside_variable" \
-		  "complete nested package name"
+    "p pck.inner.inside_variable" \
+    "complete nested package name"
 
 # A fully qualified symbol name, mangled...
 test_gdb_complete "pck__inner__ins" \
-		  "p pck__inner__inside_variable"
+    "p pck__inner__inside_variable"
 
 # A fully qualified symbol name...
 test_gdb_complete "pck.inner.ins" \
-		  "p pck.inner.inside_variable"
+    "p pck.inner.inside_variable"
 
 # Make sure that "inside" is not returned as a possible completion
 # for "side"...
@@ -98,7 +98,7 @@  test_gdb_no_completion "exported"
 
 # check the "<...>" notation.
 test_gdb_complete "<Exported" \
-		  "p <Exported_Capitalized>"
+    "p <Exported_Capitalized>"
 
 # While at it, make sure we can print the symbol too, using the '<'
 # notation.
@@ -112,16 +112,16 @@  gdb_test "p exported_capitalized" \
 
 # A global symbol, created by the binder, that starts with __gnat...
 test_gdb_complete "__gnat_ada_main_progra" \
-		  "p __gnat_ada_main_program_name"
+    "p __gnat_ada_main_program_name"
 
 # A global symbol, created by the binder, that starts with __gnat,
 # and using the '<' notation.
 test_gdb_complete "<__gnat_ada_main_prog" \
-		  "p <__gnat_ada_main_program_name>"
+    "p <__gnat_ada_main_program_name>"
 
 # A local variable
 test_gdb_complete "some" \
-		  "p some_local_variable"
+    "p some_local_variable"
 
 # A local variable variable, but in a different procedure. No match
 # should be returned.
@@ -132,7 +132,7 @@  test_gdb_no_completion "pck.ins"
 
 # A fully qualified variable name that does exist...
 test_gdb_complete "pck.my" \
-		  "p pck.my_global_variable"
+    "p pck.my_global_variable"
 
 # A fully qualified package name
 test_gdb_complete "pck.inner" \
@@ -141,28 +141,28 @@  test_gdb_complete "pck.inner" \
 
 # A fully qualified package name, with a dot at the end
 test_gdb_complete "pck.inner." \
-		  "p pck.inner.inside_variable"
+    "p pck.inner.inside_variable"
 
 # Two matches, from the global scope:
 test_gdb_complete "local_ident" \
-		  [multi_line "p local_identical_one" \
-			      "p local_identical_two" ]
+    [multi_line "p local_identical_one" \
+	 "p local_identical_two" ]
 
 # Two matches, from the global scope, but using fully qualified names:
 test_gdb_complete "pck.local_ident" \
-		  [multi_line "p pck.local_identical_one" \
-			      "p pck.local_identical_two" ]
+    [multi_line "p pck.local_identical_one" \
+	 "p pck.local_identical_two" ]
 
 # Two matches, from the global scope, but using mangled fully qualified
 # names:
 test_gdb_complete "pck__local_ident" \
-		  [multi_line "p pck__local_identical_one" \
-			      "p pck__local_identical_two" ]
+    [multi_line "p pck__local_identical_one" \
+	 "p pck__local_identical_two" ]
 
 # Two matches, one from the global scope, the other from the local scope:
 test_gdb_complete "external_ident" \
-		  [multi_line "p external_identical_one" \
-			      "p external_identical_two" ]
+    [multi_line "p external_identical_one" \
+	 "p external_identical_two" ]
 
 # Complete on the name of package.
 test_gdb_complete "pck" \
@@ -198,7 +198,7 @@  test_gdb_complete "pck." \
 
 # Complete a mangled symbol name, but using the '<...>' notation.
 test_gdb_complete "<pck__my" \
-		  "p <pck__my_global_variable>"
+    "p <pck__my_global_variable>"
 
 # Very simple completion, but using the interactive form, this time.
 # The verification we are trying to make involves the event loop,
@@ -224,12 +224,12 @@  if { [readline_is_used] } {
 # which users can select a specific function.  This should not happen during
 # completion, though.
 test_gdb_complete "ambig" \
-		  [multi_line "p ambiguous_func" \
-			      "p ambiguous_proc" ]
+    [multi_line "p ambiguous_func" \
+	 "p ambiguous_proc" ]
 test_gdb_complete "ambiguous_f" \
-		  "p ambiguous_func"
+    "p ambiguous_func"
 test_gdb_complete "ambiguous_func" \
-		  "p ambiguous_func"
+    "p ambiguous_func"
 
 # Perform a test intended to verify the behavior where the number
 # of possible completions is very large.  The goal is not to verify
diff --git a/gdb/testsuite/gdb.ada/cond_lang.exp b/gdb/testsuite/gdb.ada/cond_lang.exp
index 599a1223643..25e903d6def 100644
--- a/gdb/testsuite/gdb.ada/cond_lang.exp
+++ b/gdb/testsuite/gdb.ada/cond_lang.exp
@@ -25,7 +25,7 @@  set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -33,7 +33,7 @@  clean_restart ${testfile}
 # Run to c_function an verify that the language automatically gets set to C.
 runto c_function
 gdb_test "show lang" \
-	 "The current source language is \"auto; currently c\"\\."
+    "The current source language is \"auto; currently c\"\\."
 
 # Now, insert a breakpoint inside an Ada unit, using a condition written
 # in Ada. Even though the current language is "auto; currently c", we
@@ -41,11 +41,11 @@  gdb_test "show lang" \
 # current language mode is auto, and the breakpoint is inside Ada code.
 set bp_location [gdb_get_line_number "STOP" ${testdir}/mixed.adb]
 gdb_test "break mixed.adb:${bp_location} if light = green" \
-	 "Breakpoint \[0-9\]* at .*: file (.*/)?mixed.adb, line \[0-9\]*\\."
+    "Breakpoint \[0-9\]* at .*: file (.*/)?mixed.adb, line \[0-9\]*\\."
 
 # Now, continue until we hit the breakpoint.  If the condition is
 # evaluated correctly, the first hit will be ignored, and the debugger
 # will stop at the second hit only, when the "light" argument is equal
 # to green.
 gdb_test "continue" \
-	 "Breakpoint \[0-9\]*, mixed\\.break_me \\(light=green\\) at .*"
+    "Breakpoint \[0-9\]*, mixed\\.break_me \\(light=green\\) at .*"
diff --git a/gdb/testsuite/gdb.ada/convvar_comp.exp b/gdb/testsuite/gdb.ada/convvar_comp.exp
index 339fb34b94f..8ea94183236 100644
--- a/gdb/testsuite/gdb.ada/convvar_comp.exp
+++ b/gdb/testsuite/gdb.ada/convvar_comp.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile pb16_063
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -28,7 +28,7 @@  clean_restart ${testfile}
 set bp_location [gdb_get_line_number "BREAK" "$testdir/pck.adb"]
 
 if {![runto pck.adb:$bp_location]} {
-  return
+    return
 }
 
 set val ""
diff --git a/gdb/testsuite/gdb.ada/dgopt.exp b/gdb/testsuite/gdb.ada/dgopt.exp
index 438840fe9b0..a45e134f9b1 100644
--- a/gdb/testsuite/gdb.ada/dgopt.exp
+++ b/gdb/testsuite/gdb.ada/dgopt.exp
@@ -23,7 +23,7 @@  standard_ada_testfile x
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \
 	 {debug additional_flags=-gnatDG}] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/disc_arr_bound.exp b/gdb/testsuite/gdb.ada/disc_arr_bound.exp
index e34ab4ece07..d64afc26804 100644
--- a/gdb/testsuite/gdb.ada/disc_arr_bound.exp
+++ b/gdb/testsuite/gdb.ada/disc_arr_bound.exp
@@ -20,18 +20,18 @@  require allow_ada_tests
 standard_ada_testfile foo_n612_026
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_n612_026.adb]
 if {![runto "foo_n612_026.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print r" \
-	 " = \\(n => 10, a => \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)\\)"
+    " = \\(n => 10, a => \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)\\)"
 
 gdb_test "print r.a" \
-	 " = \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)"
+    " = \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)"
diff --git a/gdb/testsuite/gdb.ada/discrete-char.exp b/gdb/testsuite/gdb.ada/discrete-char.exp
index 515219aa2b6..eb119f2e0d5 100644
--- a/gdb/testsuite/gdb.ada/discrete-char.exp
+++ b/gdb/testsuite/gdb.ada/discrete-char.exp
@@ -29,7 +29,7 @@  clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/main.adb]
 if {![runto "main.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test_no_output "set print array-indexes on"
diff --git a/gdb/testsuite/gdb.ada/dot_all.exp b/gdb/testsuite/gdb.ada/dot_all.exp
index 3bae392dff8..412f5d623ee 100644
--- a/gdb/testsuite/gdb.ada/dot_all.exp
+++ b/gdb/testsuite/gdb.ada/dot_all.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print addr.all" " = 123"
diff --git a/gdb/testsuite/gdb.ada/dyn_arrayidx.exp b/gdb/testsuite/gdb.ada/dyn_arrayidx.exp
index 0affece8681..4882838f5e6 100644
--- a/gdb/testsuite/gdb.ada/dyn_arrayidx.exp
+++ b/gdb/testsuite/gdb.ada/dyn_arrayidx.exp
@@ -33,4 +33,4 @@  runto "foo.adb:$bp_location"
 gdb_test_no_output "maintenance set ada ignore-descriptive-types"
 
 gdb_test "ptype array_type" \
-	 " = array \\(5 \\.\\. 10\\) of natural" \
+    " = array \\(5 \\.\\. 10\\) of natural" \
diff --git a/gdb/testsuite/gdb.ada/dyn_loc.exp b/gdb/testsuite/gdb.ada/dyn_loc.exp
index 5ff2287779c..3ef4cdff3ec 100644
--- a/gdb/testsuite/gdb.ada/dyn_loc.exp
+++ b/gdb/testsuite/gdb.ada/dyn_loc.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "BREAK" ${testdir}/pack.adb]
 if {![runto "pack.adb:$bp_location"]} {
-  return
+    return
 }
 
 set eol "\r\n"
diff --git a/gdb/testsuite/gdb.ada/dyn_stride.exp b/gdb/testsuite/gdb.ada/dyn_stride.exp
index b25a56910da..49cba5463ee 100644
--- a/gdb/testsuite/gdb.ada/dyn_stride.exp
+++ b/gdb/testsuite/gdb.ada/dyn_stride.exp
@@ -20,27 +20,27 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print A1(1)" \
-	 "\\(i => 0, s => \"\"\\)"
+    "\\(i => 0, s => \"\"\\)"
 
 gdb_test "print A1(2)" \
-	 "\\(i => 1, s => \"A\"\\)"
+    "\\(i => 1, s => \"A\"\\)"
 
 gdb_test "print A1(3)" \
-	 "\\(i => 2, s => \"AB\"\\)"
+    "\\(i => 2, s => \"AB\"\\)"
 
 gdb_test "print A1(1..3)" \
-	 "\\(\\(i => 0, s => \"\"\\), \\(i => 1, s => \"A\"\\), \\(i => 2, s => \"AB\"\\)\\)"
+    "\\(\\(i => 0, s => \"\"\\), \\(i => 1, s => \"A\"\\), \\(i => 2, s => \"AB\"\\)\\)"
 
 # Test the use of the "repeat" operator (@).
 #
@@ -59,4 +59,4 @@  gdb_test "print A1(1..3)" \
 # of the array).
 
 gdb_test "print a1(1)@3" \
-	 " = \\(\\(i => 0, s => \"\"\\), \\(i => -?$decimal, s => .*\\), \\(i => -?$decimal, s => .*\\)\\)"
+    " = \\(\\(i => 0, s => \"\"\\), \\(i => -?$decimal, s => .*\\), \\(i => -?$decimal, s => .*\\)\\)"
diff --git a/gdb/testsuite/gdb.ada/dynamic-iface.exp b/gdb/testsuite/gdb.ada/dynamic-iface.exp
index 3e55be94996..4b27c9e4b3a 100644
--- a/gdb/testsuite/gdb.ada/dynamic-iface.exp
+++ b/gdb/testsuite/gdb.ada/dynamic-iface.exp
@@ -22,7 +22,7 @@  require gnat_runtime_has_debug_info
 standard_ada_testfile main
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug additional_flags=-gnat05}] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/enums_overload.exp b/gdb/testsuite/gdb.ada/enums_overload.exp
index cbb8b5c49e4..121eb4716a3 100644
--- a/gdb/testsuite/gdb.ada/enums_overload.exp
+++ b/gdb/testsuite/gdb.ada/enums_overload.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile enums_overload_main
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp
index b2dc3bf0fb7..fc3b9cd2812 100644
--- a/gdb/testsuite/gdb.ada/excep_handle.exp
+++ b/gdb/testsuite/gdb.ada/excep_handle.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -32,16 +32,16 @@  set sp "\[ \t\]*"
 
 set when "when"
 set catchpoint_constraint_error_msg \
-  "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Constraint_Error =>"
+    "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Constraint_Error =>"
 
 set catchpoint_program_error_msg \
-  "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Program_Error =>"
+    "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Program_Error =>"
 
 set catchpoint_storage_error_msg \
-  "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Storage_Error =>"
+    "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Storage_Error =>"
 
 if {![runto_main]} {
-   return
+    return
 }
 
 ############################################
@@ -70,7 +70,7 @@  gdb_test "continue" \
     "continuing and stopping in Storage_Error exception handlers"
 
 gdb_test_no_output "delete 2" \
-		   "delete catchpoint on all Ada exceptions handlers"
+    "delete catchpoint on all Ada exceptions handlers"
 
 ##################################################
 # 2. Try catching some named exception handlers. #
@@ -79,8 +79,8 @@  gdb_test_no_output "delete 2" \
 # Insert a catchpoint on Program_Error Ada exception handlers.
 
 gdb_test "catch handlers Program_Error" \
-	 "Catchpoint $decimal: `Program_Error' Ada exception handlers" \
-	 "insert catchpoint on Program_Error Ada exception handlers"
+    "Catchpoint $decimal: `Program_Error' Ada exception handlers" \
+    "insert catchpoint on Program_Error Ada exception handlers"
 
 # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one.
 
@@ -95,8 +95,8 @@  gdb_test_no_output \
 # Insert a catchpoint on Storage_Error Ada exception handlers.
 
 gdb_test "catch handlers Storage_Error" \
-	 "Catchpoint $decimal: `Storage_Error' Ada exception handlers" \
-	 "insert catchpoint on Storage_Error Ada exception handlers"
+    "Catchpoint $decimal: `Storage_Error' Ada exception handlers" \
+    "insert catchpoint on Storage_Error Ada exception handlers"
 
 # Continue, we should stop at Storage_Error handlers.
 
@@ -115,13 +115,13 @@  gdb_test_no_output \
 # Insert a catchpoint on all Ada exceptions handlers with condition.
 
 gdb_test "catch handlers if Global_Var = 2" \
-	 "Catchpoint $decimal: all Ada exceptions handlers" \
-	 "insert catchpoint on all Ada exception handlers with condition"
+    "Catchpoint $decimal: all Ada exceptions handlers" \
+    "insert catchpoint on all Ada exception handlers with condition"
 
 # Check that condition is stored and properly displayed.
 
 gdb_test "info breakpoint" "stop only if Global_Var = 2" \
-	 "Check catch handlers with condition"
+    "Check catch handlers with condition"
 
 # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one.
 
@@ -154,5 +154,5 @@  gdb_test "continue" \
 # Continue, the program should exit properly.
 
 gdb_test "continue" \
-	 "Continuing\\..*$inferior_exited_re.*" \
-	 "continuing to program completion"
+    "Continuing\\..*$inferior_exited_re.*" \
+    "continuing to program completion"
diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp
index 8f64be3acdc..53325affff9 100644
--- a/gdb/testsuite/gdb.ada/exec_changed.exp
+++ b/gdb/testsuite/gdb.ada/exec_changed.exp
@@ -56,8 +56,8 @@  if { [gdb_start_cmd] < 0 } {
 }
 
 gdb_test "" \
-	 "first \\(\\) at .*first.adb.*" \
-	 "start first"
+    "first \\(\\) at .*first.adb.*" \
+    "start first"
 
 # Restore first executable to its original name, and move
 # second executable into its place.  Ensure that the new
@@ -78,8 +78,8 @@  if { [gdb_start_cmd] < 0 } {
     fail "start second"
 } else {
     gdb_test "" \
-	     "second \\(\\) at .*second.adb.*" \
-	     "start second"
+	"second \\(\\) at .*second.adb.*" \
+	"start second"
 }
 
 # Try again, this time with just changing the file time of first.
diff --git a/gdb/testsuite/gdb.ada/expr_delims.exp b/gdb/testsuite/gdb.ada/expr_delims.exp
index 332cc811df2..89d3eda6373 100644
--- a/gdb/testsuite/gdb.ada/expr_delims.exp
+++ b/gdb/testsuite/gdb.ada/expr_delims.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -36,32 +36,32 @@  gdb_run_cmd
 gdb_test "" "Breakpoint $decimal, foo \\(\\).*" \
     "run to foo"
 gdb_test "continue" \
-	 "Continuing\\..*Breakpoint $decimal, foo \\(\\).*"
+    "Continuing\\..*Breakpoint $decimal, foo \\(\\).*"
 
 # Make sure that "thread" may be used as a variable without being mistaken
 # for an expression delimiter.
 gdb_test "print thread" \
-	 "= 1" \
-	 "print variable 'thread'"
+    "= 1" \
+    "print variable 'thread'"
 
 gdb_test_no_output "delete 1"
 
 gdb_test "watch thread" \
-	 ".*atchpoint \[0-9\]+: thread" \
-	 "set plain watchpoint on variable 'thread'"
+    ".*atchpoint \[0-9\]+: thread" \
+    "set plain watchpoint on variable 'thread'"
 
 # Make sure that 'if' when followed by an expression beginning
 # with 'i' works.
 gdb_test "watch thread if i = 2" \
-	 ".*atchpoint \[0-9\]+: thread" \
-	 "set conditional watchpoint."
+    ".*atchpoint \[0-9\]+: thread" \
+    "set conditional watchpoint."
 
 gdb_test "info break" \
-	 ".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \
-	 "check that watchpoint is set correctly."
+    ".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \
+    "check that watchpoint is set correctly."
 
 # Check for right error when using both 'if' and 'thread' clauses.
 
 gdb_test "break foo.adb:$bp_location if thread = 10 thread 999" \
-	 ".*Unknown thread 999\\." \
-	 "combination of 'if' and 'thread' delimiters."
+    ".*Unknown thread 999\\." \
+    "combination of 'if' and 'thread' delimiters."
diff --git a/gdb/testsuite/gdb.ada/expr_with_funcall.exp b/gdb/testsuite/gdb.ada/expr_with_funcall.exp
index fc06b7a9773..d842d086f5c 100644
--- a/gdb/testsuite/gdb.ada/expr_with_funcall.exp
+++ b/gdb/testsuite/gdb.ada/expr_with_funcall.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile expr_r821_013
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/exprs.exp b/gdb/testsuite/gdb.ada/exprs.exp
index 1ff5ed0e403..80d439ce098 100644
--- a/gdb/testsuite/gdb.ada/exprs.exp
+++ b/gdb/testsuite/gdb.ada/exprs.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/extended-access.exp b/gdb/testsuite/gdb.ada/extended-access.exp
index c54c5f65a26..8c811c9a145 100644
--- a/gdb/testsuite/gdb.ada/extended-access.exp
+++ b/gdb/testsuite/gdb.ada/extended-access.exp
@@ -24,7 +24,7 @@  if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
 # For riscv64-linux, we need to run to main, or the_array.p_array will still
 # be nullptr.
 if {![runto "main"]} {
-  return
+    return
 }
 
 # The test case is written in C, because it was easy to make the
diff --git a/gdb/testsuite/gdb.ada/fin_fun_out.exp b/gdb/testsuite/gdb.ada/fin_fun_out.exp
index d71a31f0ebc..3f0b1cfa9f5 100644
--- a/gdb/testsuite/gdb.ada/fin_fun_out.exp
+++ b/gdb/testsuite/gdb.ada/fin_fun_out.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_o525_013
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -33,8 +33,8 @@  runto "bar.f"
 # to display, depending on the ABI.  The objective of the test is
 # to verify that we don't crash, so keep the expected output simple...
 gdb_test "finish" \
-	 ".*Value returned.*"
+    ".*Value returned.*"
 
 # Verify that GDB is still alive...
 gdb_test "print 1" \
-	 "= 1"
+    "= 1"
diff --git a/gdb/testsuite/gdb.ada/finish-large.exp b/gdb/testsuite/gdb.ada/finish-large.exp
index 61e7a79ea9c..37b0f6f065f 100644
--- a/gdb/testsuite/gdb.ada/finish-large.exp
+++ b/gdb/testsuite/gdb.ada/finish-large.exp
@@ -22,11 +22,11 @@  standard_ada_testfile p
 set flags {debug}
 
 if {[ada_fvar_tracking]} {
-  lappend flags "additional_flags=-fvar-tracking"
+    lappend flags "additional_flags=-fvar-tracking"
 }
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/finish-var-size.exp b/gdb/testsuite/gdb.ada/finish-var-size.exp
index 7486dcc10c6..2477d9197b4 100644
--- a/gdb/testsuite/gdb.ada/finish-var-size.exp
+++ b/gdb/testsuite/gdb.ada/finish-var-size.exp
@@ -29,7 +29,7 @@  if { [ada_fvar_tracking] } {
 }
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $opts] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -40,7 +40,7 @@  set value [string_to_regexp "= (defined => true, payload => true)"]
 # With some ABIs the return value cannot be determined.  Accept this,
 # or the correct result.
 gdb_test "finish" \
-	 "Value returned .*($value|Cannot determine contents)"
+    "Value returned .*($value|Cannot determine contents)"
 
 # Test that an inferior call yields the correct result.
 gdb_test "print pck.get(True)" $value
diff --git a/gdb/testsuite/gdb.ada/fixed_cmp.exp b/gdb/testsuite/gdb.ada/fixed_cmp.exp
index 0385f8ee847..f8f9fccadf5 100644
--- a/gdb/testsuite/gdb.ada/fixed_cmp.exp
+++ b/gdb/testsuite/gdb.ada/fixed_cmp.exp
@@ -23,7 +23,7 @@  foreach_gnat_encoding gnat_encodings flags {all minimal} {
     lappend flags debug
 
     if {[gdb_compile_ada "${srcfile}" "${binfile}-${gnat_encodings}" executable $flags] != "" } {
-      return
+	return
     }
 
     clean_restart ${testfile}-${gnat_encodings}
@@ -32,16 +32,16 @@  foreach_gnat_encoding gnat_encodings flags {all minimal} {
     runto "fixed.adb:$bp_location"
 
     gdb_test "print My_Var > 10.0" \
-	     "= true"
+	"= true"
 
     gdb_test "print My_Var > 20.0" \
-	     "= false"
+	"= false"
 
     # Do the same, but with integer values.
 
     gdb_test "print My_Var > 10" \
-	     "= true"
+	"= true"
 
     gdb_test "print My_Var > 20" \
-	     "= false"
+	"= false"
 }
diff --git a/gdb/testsuite/gdb.ada/fixed_points_function.exp b/gdb/testsuite/gdb.ada/fixed_points_function.exp
index 2299fd3c098..c5d7c23f9d3 100644
--- a/gdb/testsuite/gdb.ada/fixed_points_function.exp
+++ b/gdb/testsuite/gdb.ada/fixed_points_function.exp
@@ -29,10 +29,10 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/fixed_points_function.adb
 runto "fixed_points_function.adb:$bp_location"
 
 gdb_test "print call_fp1(1)" \
-	 " = 1"
+    " = 1"
 
 gdb_test "print call_fp1(0.5)" \
-	 " = 0.5"
+    " = 0.5"
 
 gdb_test "print call_fp1(-0.5)" \
-	 " = -0.5"
+    " = -0.5"
diff --git a/gdb/testsuite/gdb.ada/float_param.exp b/gdb/testsuite/gdb.ada/float_param.exp
index 78384fa56b4..3d89c4b9fb6 100644
--- a/gdb/testsuite/gdb.ada/float_param.exp
+++ b/gdb/testsuite/gdb.ada/float_param.exp
@@ -30,12 +30,12 @@  runto "foo.adb:$bp_location"
 
 gdb_test_no_output "call set_float(2.0)"
 gdb_test "print global_float" \
-	 " = 2\\.0"
+    " = 2\\.0"
 
 gdb_test_no_output "call set_double(1, 3.0)"
 gdb_test "print global_double" \
-	 " = 3\\.0"
+    " = 3\\.0"
 
 gdb_test_no_output "call set_long_double(1, global_small_struct, 4.0)"
 gdb_test "print global_long_double" \
-	 " = 4\\.0"
+    " = 4\\.0"
diff --git a/gdb/testsuite/gdb.ada/frame_args.exp b/gdb/testsuite/gdb.ada/frame_args.exp
index 701a8a1a5f5..d917dd327b5 100644
--- a/gdb/testsuite/gdb.ada/frame_args.exp
+++ b/gdb/testsuite/gdb.ada/frame_args.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,14 +31,14 @@  set eol "\r\n"
 set sp "\[ \t\]*"
 
 if {![runto break_me]} {
-  return
+    return
 }
 
 # First, print all the arrays without indexes
 
 gdb_test_no_output "set print frame-arguments scalars" \
-	 "set print frame-arguments scalars"
+    "set print frame-arguments scalars"
 
 gdb_test "frame 1" \
-	 "#1$sp$any_addr in pck.call_me \\(int=1, flt=2.0, bln=true, ary=\\.\\.\\., chr=106 'j', sad=\\(system.address\\) $any_addr, rec=\\.\\.\\.\\).*" \
-	 "display frame 1 with frame-arguments set to scalars"
+    "#1$sp$any_addr in pck.call_me \\(int=1, flt=2.0, bln=true, ary=\\.\\.\\., chr=106 'j', sad=\\(system.address\\) $any_addr, rec=\\.\\.\\.\\).*" \
+    "display frame 1 with frame-arguments set to scalars"
diff --git a/gdb/testsuite/gdb.ada/fullname_bp.exp b/gdb/testsuite/gdb.ada/fullname_bp.exp
index ae0f7d21683..0ade694d051 100644
--- a/gdb/testsuite/gdb.ada/fullname_bp.exp
+++ b/gdb/testsuite/gdb.ada/fullname_bp.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 # Note: We restart the debugger before setting each breakpoint, because
@@ -31,7 +31,7 @@  clean_restart ${testfile}
 # Break on "pck.hello" rather than just "hello" to make sure we trigger
 # the non-wild symbol lookup.
 gdb_test "break pck.hello" \
-	 "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
 
 # Do the same, but this time using a linespec where the user also
 # provided a filename.
@@ -39,7 +39,7 @@  gdb_test "break pck.hello" \
 clean_restart ${testfile}
 
 gdb_test "break pck.adb:pck.hello" \
-	 "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
 
 # Same scenarios as above, but with a function name that is spelled
 # with upper-case letters.
@@ -47,9 +47,9 @@  gdb_test "break pck.adb:pck.hello" \
 clean_restart ${testfile}
 
 gdb_test "break Pck.Hello" \
-	 "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
 
 clean_restart ${testfile}
 
 gdb_test "break pck.adb:Pck.Hello" \
-	 "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+."
diff --git a/gdb/testsuite/gdb.ada/fun_addr.exp b/gdb/testsuite/gdb.ada/fun_addr.exp
index ed22a9d65b7..0165955bda0 100644
--- a/gdb/testsuite/gdb.ada/fun_addr.exp
+++ b/gdb/testsuite/gdb.ada/fun_addr.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,4 +29,4 @@  clean_restart ${testfile}
 # the inferior is *not* running (no frame).
 
 gdb_test "print foo'address" \
-	 "= .* 0x\[0-9a-zA-Z\]+ <foo>"
+    "= .* 0x\[0-9a-zA-Z\]+ <foo>"
diff --git a/gdb/testsuite/gdb.ada/fun_in_declare.exp b/gdb/testsuite/gdb.ada/fun_in_declare.exp
index 60f761048de..19943da3e78 100644
--- a/gdb/testsuite/gdb.ada/fun_in_declare.exp
+++ b/gdb/testsuite/gdb.ada/fun_in_declare.exp
@@ -20,13 +20,13 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-  return
+    return
 }
 
 # Some variables used to simplify the maintenance of some of
@@ -36,9 +36,9 @@  set any_addr "0x\[0-9a-zA-Z\]+"
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 gdb_test "break foo.adb:$bp_location" \
-	 "Breakpoint $any_nb at $any_addr: file .*foo.adb, line $any_nb." \
-	 "insert breakpoint inside foo.call_me"
+    "Breakpoint $any_nb at $any_addr: file .*foo.adb, line $any_nb." \
+    "insert breakpoint inside foo.call_me"
 
 gdb_test "continue" \
-	 ".*Breakpoint $any_nb, foo\\.call_me \\(\\) at .*foo.adb:$any_nb.*" \
-	 "decoding of function name"
+    ".*Breakpoint $any_nb, foo\\.call_me \\(\\) at .*foo.adb:$any_nb.*" \
+    "decoding of function name"
diff --git a/gdb/testsuite/gdb.ada/fun_overload_menu.exp b/gdb/testsuite/gdb.ada/fun_overload_menu.exp
index 117f1ffb8cd..c0456aa85dc 100644
--- a/gdb/testsuite/gdb.ada/fun_overload_menu.exp
+++ b/gdb/testsuite/gdb.ada/fun_overload_menu.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/fun_renaming.exp b/gdb/testsuite/gdb.ada/fun_renaming.exp
index 05e0c2926f7..aedfdefc5ce 100644
--- a/gdb/testsuite/gdb.ada/fun_renaming.exp
+++ b/gdb/testsuite/gdb.ada/fun_renaming.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile fun_renaming
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/funcall_char.exp b/gdb/testsuite/gdb.ada/funcall_char.exp
index 108fcde5d7a..190b1942823 100644
--- a/gdb/testsuite/gdb.ada/funcall_char.exp
+++ b/gdb/testsuite/gdb.ada/funcall_char.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/funcall_param.exp b/gdb/testsuite/gdb.ada/funcall_param.exp
index e3e7fe553b2..590ecad186e 100644
--- a/gdb/testsuite/gdb.ada/funcall_param.exp
+++ b/gdb/testsuite/gdb.ada/funcall_param.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -32,4 +32,4 @@  runto "foo.adb:$bp_location"
 # class-wide.
 
 gdb_test "p ident (ident (my_parameter))" \
-	 "= \\(one => 1, two => 2, three => 3\\)" "value of ident"
+    "= \\(one => 1, two => 2, three => 3\\)" "value of ident"
diff --git a/gdb/testsuite/gdb.ada/funcall_ptr.exp b/gdb/testsuite/gdb.ada/funcall_ptr.exp
index f20e9908932..5c7ec23a518 100644
--- a/gdb/testsuite/gdb.ada/funcall_ptr.exp
+++ b/gdb/testsuite/gdb.ada/funcall_ptr.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,7 +29,7 @@  set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "print pck.ga" " = \\(access integer\\) 0x0" \
-	 "Check that initial value of GA is null"
+    "Check that initial value of GA is null"
 
 gdb_test_no_output "call pck.p(0x1234)"
 
@@ -39,4 +39,4 @@  gdb_test_no_output "call pck.p(0x1234)"
 # procedure hence should be 0x1234 after the call above.
 
 gdb_test "print pck.ga" " = \\(access integer\\) 0x1234" \
-	 "Check that value of GA is 0x1234"
+    "Check that value of GA is 0x1234"
diff --git a/gdb/testsuite/gdb.ada/ghost.exp b/gdb/testsuite/gdb.ada/ghost.exp
index 1758ea87ab3..26b1d784d63 100644
--- a/gdb/testsuite/gdb.ada/ghost.exp
+++ b/gdb/testsuite/gdb.ada/ghost.exp
@@ -21,14 +21,14 @@  standard_ada_testfile main
 
 set flags [list debug additional_flags=-gnata]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/main.adb]
 if {![runto "main.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print pck.value" " = 64 '@'"
diff --git a/gdb/testsuite/gdb.ada/homonym.exp b/gdb/testsuite/gdb.ada/homonym.exp
index 778507c2cbe..e4327a0eccc 100644
--- a/gdb/testsuite/gdb.ada/homonym.exp
+++ b/gdb/testsuite/gdb.ada/homonym.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile homonym_main
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -51,24 +51,24 @@  runto "homonym.adb:$bp_location"
 # sure that the debugger doesn't get mixed up.
 
 gdb_test "ptype local_type" \
-	 "type = range -100 \\.\\. 100" \
-	 "ptype local_type at BREAK_1"
+    "type = range -100 \\.\\. 100" \
+    "ptype local_type at BREAK_1"
 
 gdb_test "ptype local_type_subtype" \
-	 "type = range -100 \\.\\. 100" \
-	 "ptype local_type_subtype at BREAK_1"
+    "type = range -100 \\.\\. 100" \
+    "ptype local_type_subtype at BREAK_1"
 
 gdb_test "ptype int_type" \
-	 "type = range -100 \\.\\. 100" \
-	 "ptype int_type at BREAK_1"
+    "type = range -100 \\.\\. 100" \
+    "ptype int_type at BREAK_1"
 
 gdb_test "ptype lcl" \
-	 "type = range -100 \\.\\. 100" \
-	 "ptype lcl at BREAK_1"
+    "type = range -100 \\.\\. 100" \
+    "ptype lcl at BREAK_1"
 
 gdb_test "print lcl" \
-	 "= 29" \
-	 "print lcl at BREAK_1"
+    "= 29" \
+    "print lcl at BREAK_1"
 
 # Now, continue until reaching BREAK_2, and do the same commands
 # as above.  The result should be different since the definitions
@@ -76,25 +76,25 @@  gdb_test "print lcl" \
 
 set bp_location [gdb_get_line_number "BREAK_2" ${testdir}/homonym.adb]
 gdb_test "break homonym.adb:$bp_location" \
-	 "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*homonym\\.adb, line \[0-9\]+\\." \
-	 "break at BREAK_2"
+    "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*homonym\\.adb, line \[0-9\]+\\." \
+    "break at BREAK_2"
 
 gdb_test "continue" \
-	 ".*Breakpoint \[0-9\]+, homonym\\.get_value \\(\\) at .*homonym\\.adb:.*" \
-	 "continue until BREAK_2"
+    ".*Breakpoint \[0-9\]+, homonym\\.get_value \\(\\) at .*homonym\\.adb:.*" \
+    "continue until BREAK_2"
 
 gdb_test "ptype local_type" \
-	 "type = range 1 \\.\\. 19740804" \
-	 "ptype local_type at BREAK_2"
+    "type = range 1 \\.\\. 19740804" \
+    "ptype local_type at BREAK_2"
 
 gdb_test "ptype local_type_subtype" \
-	 "type = range 1 \\.\\. 19740804" \
-	 "ptype local_type_subtype at BREAK_2"
+    "type = range 1 \\.\\. 19740804" \
+    "ptype local_type_subtype at BREAK_2"
 
 gdb_test "ptype lcl" \
-	 "type = range 1 \\.\\. 19740804" \
-	 "ptype lcl at BREAK_2"
+    "type = range 1 \\.\\. 19740804" \
+    "ptype lcl at BREAK_2"
 
 gdb_test "print lcl" \
-	 "= 17" \
-	 "print lcl at BREAK_2"
+    "= 17" \
+    "print lcl at BREAK_2"
diff --git a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
index 998a4a96c35..faf8fa4b97b 100644
--- a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
+++ b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 # The following test exercises the situation when uppercase letters
diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp
index 3520ab4f272..4bcf4f7def2 100644
--- a/gdb/testsuite/gdb.ada/info_auto_lang.exp
+++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp
@@ -62,9 +62,9 @@  set func_in_ada(ada_syntax) \
 
 set type_in_c(c_syntax) "${decimal}:	typedef struct {\\.\\.\\.} some_type_in_c;"
 set type_in_c(ada_syntax) [multi_line \
-			      "${decimal}:	record" \
-			      "    some_component_in_c: int;" \
-			      "end record" ]
+			       "${decimal}:	record" \
+			       "    some_component_in_c: int;" \
+			       "end record" ]
 set type_in_ada(c_syntax) "${decimal}:	struct global_pack__some_type_in_ada"
 set type_in_ada(ada_syntax)  "${decimal}:	global_pack.some_type_in_ada"
 
diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
index 8d1f06d7b75..c133dd02fef 100644
--- a/gdb/testsuite/gdb.ada/info_exc.exp
+++ b/gdb/testsuite/gdb.ada/info_exc.exp
@@ -20,35 +20,35 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-   return
+    return
 }
 
 gdb_test "info exceptions" \
     [multi_line "All defined Ada exceptions:" \
-		"constraint_error: $hex" \
-		"program_error: $hex" \
-		"storage_error: $hex" \
-		"tasking_error: $hex" \
-		".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ]
+	 "constraint_error: $hex" \
+	 "program_error: $hex" \
+	 "storage_error: $hex" \
+	 "tasking_error: $hex" \
+	 ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ]
 
 gdb_test "info exceptions task" \
     [multi_line "All Ada exceptions matching regular expression \"task\":" \
-		"tasking_error: $hex"]
+	 "tasking_error: $hex"]
 
 gdb_test "info exceptions global_gdb" \
     [multi_line "All Ada exceptions matching regular expression \"global_gdb\":" \
-		"const.aint_global_gdb_e: $hex"]
+	 "const.aint_global_gdb_e: $hex"]
 
 gdb_test "info exceptions const.aint" \
     [multi_line "All Ada exceptions matching regular expression \"const\\.aint\":" \
-		"constraint_error: $hex" \
-		"const.aint_global_gdb_e: $hex"]
+	 "constraint_error: $hex" \
+	 "const.aint_global_gdb_e: $hex"]
 
 foreach cmd {exception handlers} {
     gdb_test "complete catch $cmd const.a" \
diff --git a/gdb/testsuite/gdb.ada/info_types.exp b/gdb/testsuite/gdb.ada/info_types.exp
index 476c6936321..bf163145f4b 100644
--- a/gdb/testsuite/gdb.ada/info_types.exp
+++ b/gdb/testsuite/gdb.ada/info_types.exp
@@ -29,4 +29,4 @@  gdb_test "set lang ada" ""
 set eol "\r\n"
 
 gdb_test "info types new_integer_type" \
-	 "All types matching regular expression \"new_integer_type\":${eol}${eol}File .*info_types.c:${eol}.*\tint"
+    "All types matching regular expression \"new_integer_type\":${eol}${eol}File .*info_types.c:${eol}.*\tint"
diff --git a/gdb/testsuite/gdb.ada/int_deref.exp b/gdb/testsuite/gdb.ada/int_deref.exp
index 7308e787648..d861a792b3b 100644
--- a/gdb/testsuite/gdb.ada/int_deref.exp
+++ b/gdb/testsuite/gdb.ada/int_deref.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,10 +31,10 @@  runto "foo.adb:$bp_location"
 # Hijack a bit this testcase, to verify that name decoding works
 # when doing symbolic address printing.
 gdb_test "print watch'address" \
-	 " = \\(system\\.address\\) $hex <pck\\.watch>"
+    " = \\(system\\.address\\) $hex <pck\\.watch>"
 
 gdb_test "print *long_integer(watch'address)" \
-	 " = 4874"
+    " = 4874"
 
 gdb_test "print long_integer(watch'address).all" \
-	 " = 4874"
+    " = 4874"
diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp
index b46cf576b51..454c5f780c5 100644
--- a/gdb/testsuite/gdb.ada/interface.exp
+++ b/gdb/testsuite/gdb.ada/interface.exp
@@ -22,7 +22,7 @@  require gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,10 +31,10 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "print r" \
-	 "= \\(x => 1, y => 2, w => 3, h => 4\\)"
+    "= \\(x => 1, y => 2, w => 3, h => 4\\)"
 
 gdb_test "print s" \
-	 "= \\(x => 1, y => 2, w => 3, h => 4\\)"
+    "= \\(x => 1, y => 2, w => 3, h => 4\\)"
 
 set r_re "r = \[^\r\n\]*"
 set s_re "s = \[^\r\n\]*"
diff --git a/gdb/testsuite/gdb.ada/iwide.exp b/gdb/testsuite/gdb.ada/iwide.exp
index 3029f8978c4..7be3a1dae00 100644
--- a/gdb/testsuite/gdb.ada/iwide.exp
+++ b/gdb/testsuite/gdb.ada/iwide.exp
@@ -22,7 +22,7 @@  require gnat_runtime_has_debug_info
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -52,16 +52,16 @@  gdb_test_multiple "" "Runto to $bp_location" {
 }
 
 gdb_test "print My_Drawable" \
-	 "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)"
+    "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)"
 
 gdb_test "print s_access.all" \
-	 "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
+    "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
 
 gdb_test "print sp_access.all" \
-	 "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
+    "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
 
 gdb_test "print d_access.all" \
-	 "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
+    "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
 
 gdb_test "print dp_access.all" \
-	 "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
+    "\\(center => \\(x => 1, y => 2\\), radius => 3\\)"
diff --git a/gdb/testsuite/gdb.ada/lang_switch.exp b/gdb/testsuite/gdb.ada/lang_switch.exp
index 7f40c29ec5d..5e4649d5cef 100644
--- a/gdb/testsuite/gdb.ada/lang_switch.exp
+++ b/gdb/testsuite/gdb.ada/lang_switch.exp
@@ -24,7 +24,7 @@  set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -37,8 +37,8 @@  gdb_test_no_output "set print frame-arguments all"
 # Make sure that the language is switched to Ada for the second frame
 # by checking the string parameter.
 gdb_test "bt" \
-	 ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=\"msg\"\\).*" \
-	 "backtrace"
+    ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=\"msg\"\\).*" \
+    "backtrace"
 
 # Now, make sure that the language doesn't get automatically switched
 # if the current language is not "auto".
@@ -47,5 +47,5 @@  gdb_test "set lang c"
 # -fgnat-encodings=all, but since we don't care so much about the
 # precise details here, we just accept anything.
 gdb_test "bt" \
-	 ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=(@$hex: +)?.*\\).*" \
-	 "backtrace with lang set to C"
+    ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=(@$hex: +)?.*\\).*" \
+    "backtrace with lang set to C"
diff --git a/gdb/testsuite/gdb.ada/length_cond.exp b/gdb/testsuite/gdb.ada/length_cond.exp
index 12ccc00598e..618648f634a 100644
--- a/gdb/testsuite/gdb.ada/length_cond.exp
+++ b/gdb/testsuite/gdb.ada/length_cond.exp
@@ -23,7 +23,7 @@  require allow_ada_tests
 standard_ada_testfile length_cond
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/limited-length.exp b/gdb/testsuite/gdb.ada/limited-length.exp
index 3e8b663d94e..b67d37044a2 100644
--- a/gdb/testsuite/gdb.ada/limited-length.exp
+++ b/gdb/testsuite/gdb.ada/limited-length.exp
@@ -20,8 +20,8 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \
-	[list debug ]] != "" } {
-  return
+	 [list debug ]] != "" } {
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/local-enum.exp b/gdb/testsuite/gdb.ada/local-enum.exp
index cb071eacc08..2323f32a981 100644
--- a/gdb/testsuite/gdb.ada/local-enum.exp
+++ b/gdb/testsuite/gdb.ada/local-enum.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile local
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/local.adb]
 if {![runto "local.adb:$bp_location"]} {
-  return
+    return
 }
 
 # The test has two constants named 'three', with different values.
diff --git a/gdb/testsuite/gdb.ada/maint_with_ada.exp b/gdb/testsuite/gdb.ada/maint_with_ada.exp
index a03371f631c..ed71ffd5997 100644
--- a/gdb/testsuite/gdb.ada/maint_with_ada.exp
+++ b/gdb/testsuite/gdb.ada/maint_with_ada.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile var_arr_typedef
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
index eb5ffec909a..ad05c1a0f44 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_assert.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile bla
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -39,19 +39,19 @@  mi_clean_restart $::testfile
 #  - continue, the program exits.
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 mi_gdb_test "-catch-assert -c \"Global_Var = 2\"" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*,cond=\"Global_Var = 2\",.*}" \
-	    "catch assert failures with condition"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*,cond=\"Global_Var = 2\",.*}" \
+    "catch assert failures with condition"
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb]
 mi_execute_to "exec-continue" \
-	      "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\"" \
-	      "bla" "" ".*" "$bp_location" \
-	      ".*" \
-	      "continue to assert failure catchpoint hit"
+    "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\"" \
+    "bla" "" ".*" "$bp_location" \
+    ".*" \
+    "continue to assert failure catchpoint hit"
 
 # Exit the inferior.
 mi_send_resuming_command "exec-continue" "continuing to inferior exit"
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index d1bd9ed645b..f8491cf7e14 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 # A global variable used to simplify the maintenance of some of
@@ -43,8 +43,8 @@  with_test_prefix "scenario 1" {
 }
 
 mi_gdb_test "-catch-exception" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions\",.*}" \
-	    "catch all exceptions"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions\",.*}" \
+    "catch all exceptions"
 
 # Continue to caught exception.
 
@@ -101,31 +101,31 @@  with_test_prefix "scenario 2" {
 }
 
 mi_gdb_test "-catch-exception -e Program_Error" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Program_Error' Ada exception\",.*}" \
-	    "catch Program_Error"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Program_Error' Ada exception\",.*}" \
+    "catch Program_Error"
 
 mi_gdb_test "-catch-assert" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*}" \
-	    "catch assert failures"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*}" \
+    "catch assert failures"
 
 mi_gdb_test "-catch-exception -u" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"unhandled Ada exceptions\",.*}" \
-	    "catch unhandled exceptions"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"unhandled Ada exceptions\",.*}" \
+    "catch unhandled exceptions"
 
 mi_execute_to "exec-continue" \
-	      "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"PROGRAM_ERROR(\",exception-message=\"foo\\.adb:$decimal explicit raise)?\"" \
-	      "foo" "" ".*" ".*" \
-	      ".*" \
-	      "continue to exception catchpoint hit"
+    "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"PROGRAM_ERROR(\",exception-message=\"foo\\.adb:$decimal explicit raise)?\"" \
+    "foo" "" ".*" ".*" \
+    ".*" \
+    "continue to exception catchpoint hit"
 
 mi_execute_to "exec-continue" \
-	      "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\"" \
-	      "foo" "" ".*" ".*" \
-	      ".*" \
-	      "continue to assert failure catchpoint hit"
+    "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\"" \
+    "foo" "" ".*" ".*" \
+    ".*" \
+    "continue to assert failure catchpoint hit"
 
 mi_execute_to "exec-continue" \
-	      "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR\"" \
-	      "foo" "" ".*" ".*" \
-	      ".*" \
-	      "continue to unhandled exception catchpoint hit"
+    "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR\"" \
+    "foo" "" ".*" ".*" \
+    ".*" \
+    "continue to unhandled exception catchpoint hit"
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index 330079594ea..0342072e79c 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -39,8 +39,8 @@  with_test_prefix "scenario 1" {
 }
 
 mi_gdb_test "-catch-handlers" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions handlers\",.*}" \
-	    "catch all exceptions handlers"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions handlers\",.*}" \
+    "catch all exceptions handlers"
 
 # Continue to exception handler.
 
@@ -91,14 +91,14 @@  with_test_prefix "scenario 2" {
 }
 
 mi_gdb_test "-catch-handlers -e Constraint_Error" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Constraint_Error' Ada exception handlers\",.*}" \
-	    "catch Constraint_Error"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Constraint_Error' Ada exception handlers\",.*}" \
+    "catch Constraint_Error"
 
 mi_execute_to "exec-continue" \
-	      "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\",exception-name=\"exception\"" \
-	      "foo" "" ".*" "$bp_ce_location" \
-	      ".*" \
-	      "continue to exception catchpoint hit"
+    "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\",exception-name=\"exception\"" \
+    "foo" "" ".*" "$bp_ce_location" \
+    ".*" \
+    "continue to exception catchpoint hit"
 
 # Exit the inferior.
 mi_send_resuming_command "exec-continue" "continuing to inferior exit"
diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
index 6dded2520a3..a7fb9585561 100644
--- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
+++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -29,7 +29,7 @@  set MIFLAGS "-i=mi"
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
index c8ab2604756..441c7b4adea 100644
--- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp
+++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-static additional_flags=-margs ]] != "" } {
-  return
+    return
 }
 
 # A global variable used to simplify the maintenance of some of
@@ -38,8 +38,8 @@  if {[mi_clean_restart $::testfile]} {
 # catchpoint that uses both conditions and exception name.
 
 mi_gdb_test "-catch-exception -c \"i = 2\" -e constraint_error" \
-	    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*}" \
-	    "catch C_E if i = 2"
+    "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*}" \
+    "catch C_E if i = 2"
 
 # It is important that we start the program's execution after having
 # inserted the exception catchpoint above.  We want to verify that
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
index 49507510053..9b6aaff81bb 100644
--- a/gdb/testsuite/gdb.ada/mi_exc_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -29,7 +29,7 @@  set MIFLAGS "-i=mi"
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 mi_delete_breakpoints
@@ -37,17 +37,17 @@  mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
 mi_gdb_test "-info-ada-exceptions" \
-  "\\^done,ada-exceptions={nr_rows=\"$decimal\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},.*{name=\"const.aint_global_gdb_e\",address=\"$hex\"}.*\\\]}" \
-  "-info-ada-exceptions"
+    "\\^done,ada-exceptions={nr_rows=\"$decimal\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},.*{name=\"const.aint_global_gdb_e\",address=\"$hex\"}.*\\\]}" \
+    "-info-ada-exceptions"
 
 mi_gdb_test "-info-ada-exceptions task" \
-  "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"tasking_error\",address=\"$hex\"}\\\]}" \
-  "-info-ada-exceptions task"
+    "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"tasking_error\",address=\"$hex\"}\\\]}" \
+    "-info-ada-exceptions task"
 
 mi_gdb_test "-info-ada-exceptions global_gdb" \
-  "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \
-  "-info-ada-exceptions global_gdb"
+    "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \
+    "-info-ada-exceptions global_gdb"
 
 mi_gdb_test "-info-ada-exceptions const.aint" \
-  "\\^done,ada-exceptions={nr_rows=\"2\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \
-  "-info-ada-exceptions const.aint"
+    "\\^done,ada-exceptions={nr_rows=\"2\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \
+    "-info-ada-exceptions const.aint"
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index e638f9717e0..0957ca5122a 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -22,7 +22,7 @@  require gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat12 ]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -31,7 +31,7 @@  set MIFLAGS "-i=mi"
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb]
diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp
index 5e3f160e322..56ca33d0953 100644
--- a/gdb/testsuite/gdb.ada/mi_prot.exp
+++ b/gdb/testsuite/gdb.ada/mi_prot.exp
@@ -31,7 +31,7 @@  set MIFLAGS "-i=mi"
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 mi_delete_breakpoints
diff --git a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
index a2813d42dff..26d46fe6f19 100644
--- a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
+++ b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_rb20_056
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -29,7 +29,7 @@  set MIFLAGS "-i=mi"
 mi_clean_restart $::testfile
 
 if {[mi_runto_main] < 0} {
-   return
+    return
 }
 
 # Continue until STOP_1, and create a varobj for variables "A" and "B".
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
index 31ef7d0dbeb..1797a275122 100644
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile task_switch
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -34,7 +34,7 @@  if {[mi_clean_restart $::testfile]} {
 mi_gdb_test "-gdb-set debug-file-directory \"\"" ".*"
 
 if {![mi_runto "task_switch.break_me"]} {
-   return
+    return
 }
 
 # Verify that "-stack-list-arguments" does not cause the debugger to
diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
index efa437adf3b..3526fae7a1a 100644
--- a/gdb/testsuite/gdb.ada/mi_task_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile task_switch
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
-  return
+    return
 }
 
 load_lib mi-support.exp
@@ -35,24 +35,24 @@  if {[mi_clean_restart $::testfile]} {
 ####################################
 
 if {![mi_runto "task_switch.break_me"]} {
-   return
+    return
 }
 
 set ada_task_info_hdr \
-  "hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"current\",colhdr=\"\"},{width=\"3\",alignment=\"1\",col_name=\"id\",colhdr=\"ID\"},{width=\"9\",alignment=\"1\",col_name=\"task-id\",colhdr=\"TID\"},{width=\"4\",alignment=\"1\",col_name=\"thread-id\",colhdr=\"\"},{width=\"4\",alignment=\"1\",col_name=\"parent-id\",colhdr=\"P-ID\"},{width=\"3\",alignment=\"1\",col_name=\"priority\",colhdr=\"Pri\"},{width=\"22\",alignment=\"-1\",col_name=\"state\",colhdr=\"State\"},{width=\"1\",alignment=\"2\",col_name=\"name\",colhdr=\"Name\"}\\\]"
+    "hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"current\",colhdr=\"\"},{width=\"3\",alignment=\"1\",col_name=\"id\",colhdr=\"ID\"},{width=\"9\",alignment=\"1\",col_name=\"task-id\",colhdr=\"TID\"},{width=\"4\",alignment=\"1\",col_name=\"thread-id\",colhdr=\"\"},{width=\"4\",alignment=\"1\",col_name=\"parent-id\",colhdr=\"P-ID\"},{width=\"3\",alignment=\"1\",col_name=\"priority\",colhdr=\"Pri\"},{width=\"22\",alignment=\"-1\",col_name=\"state\",colhdr=\"State\"},{width=\"1\",alignment=\"2\",col_name=\"name\",colhdr=\"Name\"}\\\]"
 set task_1 \
-  "{id=\"1\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",priority=\"\[0-9\]+\",state=\"(Child (Activation|Termination) Wait|Runnable)\",name=\"main_task\"}"
+    "{id=\"1\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",priority=\"\[0-9\]+\",state=\"(Child (Activation|Termination) Wait|Runnable)\",name=\"main_task\"}"
 set task_2 \
-  "{id=\"2\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"(Accept or Select Term|Runnable)\",name=\"my_callee\"}"
+    "{id=\"2\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"(Accept or Select Term|Runnable)\",name=\"my_callee\"}"
 set task_3 \
-  "{current=\"\\*\",id=\"3\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"Runnable\",name=\"my_caller\"}"
+    "{current=\"\\*\",id=\"3\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"Runnable\",name=\"my_caller\"}"
 
 # Get the full list of tasks...
 mi_gdb_test "-ada-task-info" \
-  ".*\\^done,tasks={nr_rows=\"3\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_1,$task_2,$task_3\\\]}" \
-  "-ada-task-info with no argument"
+    ".*\\^done,tasks={nr_rows=\"3\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_1,$task_2,$task_3\\\]}" \
+    "-ada-task-info with no argument"
 
 # Now, only get the info about task 3.
 mi_gdb_test "-ada-task-info 3" \
-  "\\^done,tasks={nr_rows=\"1\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_3\\\]}" \
-  "-ada-task-info 3"
+    "\\^done,tasks={nr_rows=\"1\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_3\\\]}" \
+    "-ada-task-info 3"
diff --git a/gdb/testsuite/gdb.ada/minsyms.exp b/gdb/testsuite/gdb.ada/minsyms.exp
index a66b271479d..a2133e71962 100644
--- a/gdb/testsuite/gdb.ada/minsyms.exp
+++ b/gdb/testsuite/gdb.ada/minsyms.exp
@@ -20,25 +20,25 @@  require allow_ada_tests
 standard_ada_testfile foo_qb07_057
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable ""] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto "_ada_foo_qb07_057"]} {
-  return
+    return
 }
 
 gdb_test_no_output "set language ada"
 
 gdb_test "print some_minsym" \
-	 "'some_minsym' has unknown type; cast it to its declared type"
+    "'some_minsym' has unknown type; cast it to its declared type"
 
 gdb_test "print integer(some_minsym)" \
-	 " = 1234"
+    " = 1234"
 
 gdb_test "print &some_minsym" \
-	 " = \\(access <data variable, no debug info>\\) $hex <some_minsym>"
+    " = \\(access <data variable, no debug info>\\) $hex <some_minsym>"
 
 gdb_test "print /x integer(&some_minsym)" \
-	 " = $hex"
+    " = $hex"
diff --git a/gdb/testsuite/gdb.ada/n_arr_bound.exp b/gdb/testsuite/gdb.ada/n_arr_bound.exp
index d4762231856..412438ed8c1 100644
--- a/gdb/testsuite/gdb.ada/n_arr_bound.exp
+++ b/gdb/testsuite/gdb.ada/n_arr_bound.exp
@@ -29,4 +29,4 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "ptype var" \
-	 "= array \\(0 .. -1\\) of integer"
+    "= array \\(0 .. -1\\) of integer"
diff --git a/gdb/testsuite/gdb.ada/nested.exp b/gdb/testsuite/gdb.ada/nested.exp
index 336f69ecd34..65cc422e4c3 100644
--- a/gdb/testsuite/gdb.ada/nested.exp
+++ b/gdb/testsuite/gdb.ada/nested.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile hello
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,8 +31,8 @@  set any_addr "0x\[0-9a-zA-Z\]+"
 # Try breaking on a nested function.
 
 gdb_test "break first" \
-	 "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \
-	 "break on nested function First"
+    "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \
+    "break on nested function First"
 
 gdb_test "break fourth" \
     "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \
diff --git a/gdb/testsuite/gdb.ada/notcplusplus.exp b/gdb/testsuite/gdb.ada/notcplusplus.exp
index bfd7b01d96f..d1535b9e954 100644
--- a/gdb/testsuite/gdb.ada/notcplusplus.exp
+++ b/gdb/testsuite/gdb.ada/notcplusplus.exp
@@ -26,20 +26,20 @@  if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 clean_restart ${testfile}
 
 gdb_test "print /x <symada__cS>" \
-	 "= \\(a => 0x60287af\\)" \
-	 "print <symada__cS> before loading symbols from ver.ads"
+    "= \\(a => 0x60287af\\)" \
+    "print <symada__cS> before loading symbols from ver.ads"
 
 # Force the partial symbosl from ver.ads to be expanded into full symbols.
 
 gdb_test \
-     "list ver.ads:16" \
-     [multi_line ".*" \
-		 "16\\s+package Ver is" \
-		 "17\\s+type Wrapper is record" \
-		 "18\\s+A : Integer;" \
-		 "19\\s+end record;" \
-		 "20\\s+u00045 : constant Wrapper := \\(A => 16#060287af#\\);"]
+    "list ver.ads:16" \
+    [multi_line ".*" \
+	 "16\\s+package Ver is" \
+	 "17\\s+type Wrapper is record" \
+	 "18\\s+A : Integer;" \
+	 "19\\s+end record;" \
+	 "20\\s+u00045 : constant Wrapper := \\(A => 16#060287af#\\);"]
 
 gdb_test "print /x <symada__cS>" \
-	 "= \\(a => 0x60287af\\)" \
-	 "print <symada__cS> after loading symbols from ver.ads"
+    "= \\(a => 0x60287af\\)" \
+    "print <symada__cS> after loading symbols from ver.ads"
diff --git a/gdb/testsuite/gdb.ada/null_array.exp b/gdb/testsuite/gdb.ada/null_array.exp
index dd2c6fd9782..a46d2fe9f98 100644
--- a/gdb/testsuite/gdb.ada/null_array.exp
+++ b/gdb/testsuite/gdb.ada/null_array.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -33,10 +33,10 @@  if {[gnat_version_compare <= {4 4}]} {
     setup_xfail *-*-*
 }
 gdb_test "print my_table" \
-	 "= \\(\\)"
+    "= \\(\\)"
 
 gdb_test "ptype my_table" \
-	 "type = array \\(10 \\.\\. 1\\) of integer"
+    "type = array \\(10 \\.\\. 1\\) of integer"
 
 gdb_test "print my_matrix" \
-	 "= \\(m => \\((\"\", ){9}\"\"\\)\\)"
+    "= \\(m => \\((\"\", ){9}\"\"\\)\\)"
diff --git a/gdb/testsuite/gdb.ada/null_record.exp b/gdb/testsuite/gdb.ada/null_record.exp
index e742ad1f156..3aab945e62b 100644
--- a/gdb/testsuite/gdb.ada/null_record.exp
+++ b/gdb/testsuite/gdb.ada/null_record.exp
@@ -29,5 +29,5 @@  set bp_location [gdb_get_line_number "START" ${testdir}/null_record.adb]
 runto "null_record.adb:$bp_location"
 
 gdb_test "ptype empty" \
-	 "type = record null; end record" \
-	 "ptype on null record"
+    "type = record null; end record" \
+    "ptype on null record"
diff --git a/gdb/testsuite/gdb.ada/operator_bp.exp b/gdb/testsuite/gdb.ada/operator_bp.exp
index 45d13102704..783ebd598d0 100644
--- a/gdb/testsuite/gdb.ada/operator_bp.exp
+++ b/gdb/testsuite/gdb.ada/operator_bp.exp
@@ -56,8 +56,8 @@  foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&"
 foreach op { "+" "-" "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} {
     set op_re [string_to_regexp $op]
     gdb_test "continue" \
-	     "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\
-	     "continue to \"$op\""
+	"Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\
+	"continue to \"$op\""
 }
 
 # Perform the same test, but using the qualified name of the operator,
@@ -72,13 +72,13 @@  runto "ops_test.adb:$bp_location"
 foreach op { "+" "-" } {
     set op_re [string_to_regexp $op]
     gdb_test "break ops.\"$op\"" \
-	     "Breakpoint $decimal at $hex: ops\\.\"$op_re\"\\. \\(2 locations\\)"
+	"Breakpoint $decimal at $hex: ops\\.\"$op_re\"\\. \\(2 locations\\)"
 }
 
 foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} {
     set op_re [string_to_regexp $op]
     gdb_test "break ops.\"$op\"" \
-	     "Breakpoint $decimal at $hex: file .*ops.adb, line $decimal."
+	"Breakpoint $decimal at $hex: file .*ops.adb, line $decimal."
 }
 
 # Make sure we stop correctly in each operator function.
@@ -86,6 +86,6 @@  foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&"
 foreach op { "+" "-" "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} {
     set op_re [string_to_regexp $op]
     gdb_test "continue" \
-	     "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\
-	     "continue to ops.\"$op\""
+	"Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\
+	"continue to ops.\"$op\""
 }
diff --git a/gdb/testsuite/gdb.ada/optim_drec.exp b/gdb/testsuite/gdb.ada/optim_drec.exp
index b4492d8ae67..b3cd01e0c13 100644
--- a/gdb/testsuite/gdb.ada/optim_drec.exp
+++ b/gdb/testsuite/gdb.ada/optim_drec.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto "foo"]} {
-  return
+    return
 }
 
 gdb_test "print z" \
-	 "= (\\(a => .*, b => .*, c => .*\\)|<optimized out>)"
+    "= (\\(a => .*, b => .*, c => .*\\)|<optimized out>)"
diff --git a/gdb/testsuite/gdb.ada/packed_array_assign.exp b/gdb/testsuite/gdb.ada/packed_array_assign.exp
index f0d21fd0539..dc4835a444a 100644
--- a/gdb/testsuite/gdb.ada/packed_array_assign.exp
+++ b/gdb/testsuite/gdb.ada/packed_array_assign.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile tester
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/pckd_neg.exp b/gdb/testsuite/gdb.ada/pckd_neg.exp
index 5e5af3d6bdb..f4f09632ec9 100644
--- a/gdb/testsuite/gdb.ada/pckd_neg.exp
+++ b/gdb/testsuite/gdb.ada/pckd_neg.exp
@@ -29,16 +29,16 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_o508_021.adb]
 runto "foo_o508_021.adb:$bp_location"
 
 gdb_test "print SSA" \
-	 "= \\(-1, 2, -3, 4\\)"
+    "= \\(-1, 2, -3, 4\\)"
 
 gdb_test "print SSA(1)" \
-	 "= -1"
+    "= -1"
 
 gdb_test "print SSA(2)" \
-	 "= 2"
+    "= 2"
 
 gdb_test "print SSA(3)" \
-	 "= -3"
+    "= -3"
 
 gdb_test "print SSA(4)" \
-	 "= 4"
+    "= 4"
diff --git a/gdb/testsuite/gdb.ada/pkd_arr_elem.exp b/gdb/testsuite/gdb.ada/pkd_arr_elem.exp
index ed80f43c491..22b5f953954 100644
--- a/gdb/testsuite/gdb.ada/pkd_arr_elem.exp
+++ b/gdb/testsuite/gdb.ada/pkd_arr_elem.exp
@@ -55,16 +55,16 @@  gdb_test_multiple "" "Runto to $bp_location" {
 # of the components.  Accept both known orders.
 set test "print test"
 gdb_test_multiple "$test" $test {
-  -re "= \\(size => 100, length => 1, str => \\(33 'A', nul <repeats 99 times>\\)\\).*$gdb_prompt $" {
-    pass $test
+    -re "= \\(size => 100, length => 1, str => \\(33 'A', nul <repeats 99 times>\\)\\).*$gdb_prompt $" {
+	pass $test
     }
-  -re "= \\(size => 100, str => \\(33 'A', nul <repeats 99 times>\\), length => 1\\).*$gdb_prompt $" {
-    pass $test
+    -re "= \\(size => 100, str => \\(33 'A', nul <repeats 99 times>\\), length => 1\\).*$gdb_prompt $" {
+	pass $test
     }
 }
 
 gdb_test "print test.str" \
-	 "= \\(33 'A', nul <repeats 99 times>\\)"
+    "= \\(33 'A', nul <repeats 99 times>\\)"
 
 gdb_test "print test.str(1)" \
-	 "= 33 'A'"
+    "= 33 'A'"
diff --git a/gdb/testsuite/gdb.ada/pp-rec-component.exp b/gdb/testsuite/gdb.ada/pp-rec-component.exp
index 255d353a85f..76b9871dc97 100644
--- a/gdb/testsuite/gdb.ada/pp-rec-component.exp
+++ b/gdb/testsuite/gdb.ada/pp-rec-component.exp
@@ -20,7 +20,7 @@  require allow_ada_tests allow_python_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,7 +34,7 @@  set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "print before" \
-	 " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)"
+    " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)"
 
 gdb_test "print /r before" \
-	 " = \\(secs => 1384395743\\)"
+    " = \\(secs => 1384395743\\)"
diff --git a/gdb/testsuite/gdb.ada/print_chars.exp b/gdb/testsuite/gdb.ada/print_chars.exp
index f3af8941c1f..9d15fae5425 100644
--- a/gdb/testsuite/gdb.ada/print_chars.exp
+++ b/gdb/testsuite/gdb.ada/print_chars.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -30,12 +30,12 @@  runto "foo.adb:$bp_location"
 
 
 gdb_test "print C" \
-	 "= 97 'a'"
+    "= 97 'a'"
 
 gdb_test "print WC" \
-	 "= 98 'b'"
+    "= 98 'b'"
 
 gdb_test "print WWC" \
-	 "= 99 'c'"
+    "= 99 'c'"
 
 gdb_test "print MC" " = 77 'M'"
diff --git a/gdb/testsuite/gdb.ada/print_pc.exp b/gdb/testsuite/gdb.ada/print_pc.exp
index 6a98097ecdf..79d0e2754b7 100644
--- a/gdb/testsuite/gdb.ada/print_pc.exp
+++ b/gdb/testsuite/gdb.ada/print_pc.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile dummy start
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,4 +29,4 @@  set bp_location [gdb_get_line_number "START" ${testdir}/dummy.adb]
 runto "dummy.adb:$bp_location"
 
 gdb_test "p /x \$pc" \
-	 "= 0x\[0-9a-zA-Z\]+"
+    "= 0x\[0-9a-zA-Z\]+"
diff --git a/gdb/testsuite/gdb.ada/ptr_typedef.exp b/gdb/testsuite/gdb.ada/ptr_typedef.exp
index 854e1b93fe8..34b463c4deb 100644
--- a/gdb/testsuite/gdb.ada/ptr_typedef.exp
+++ b/gdb/testsuite/gdb.ada/ptr_typedef.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
index b3414a45508..dc669647f4c 100644
--- a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
+++ b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp
@@ -18,10 +18,10 @@  require allow_ada_tests
 clean_restart
 
 gdb_test_no_output "set lang ada" \
-	 "set lang ada"
+    "set lang ada"
 
 gdb_test "ptype 3 * 2.0" \
-	 "= <\[0-9\]+-byte float>"
+    "= <\[0-9\]+-byte float>"
 
 gdb_test "ptype 3 / 2.0" \
-	 "= <\[0-9\]+-byte float>"
+    "= <\[0-9\]+-byte float>"
diff --git a/gdb/testsuite/gdb.ada/ptype_array.exp b/gdb/testsuite/gdb.ada/ptype_array.exp
index b407d76ce6c..637393d644b 100644
--- a/gdb/testsuite/gdb.ada/ptype_array.exp
+++ b/gdb/testsuite/gdb.ada/ptype_array.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/ptype_field.exp b/gdb/testsuite/gdb.ada/ptype_field.exp
index 03cae87acb7..d632cd12384 100644
--- a/gdb/testsuite/gdb.ada/ptype_field.exp
+++ b/gdb/testsuite/gdb.ada/ptype_field.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,19 +29,19 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "ptype circle" \
-	 [multi_line "type = record" \
-		     "    pos: pck\\.position;" \
-		     "    radius: integer;" \
-		     "end record" ]
+    [multi_line "type = record" \
+	 "    pos: pck\\.position;" \
+	 "    radius: integer;" \
+	 "end record" ]
 
 gdb_test "ptype circle.pos" \
-	 [multi_line "type = record" \
-		     "    x: integer;" \
-		     "    y: integer;" \
-		     "end record" ]
+    [multi_line "type = record" \
+	 "    x: integer;" \
+	 "    y: integer;" \
+	 "end record" ]
 
 gdb_test "ptype circle.pos.x" \
-	 "type = <\[0-9\]+-byte integer>"
+    "type = <\[0-9\]+-byte integer>"
 
 gdb_test "complete print my_circ" "print my_circle"
 gdb_test "complete print my_circle.r" "print my_circle\\.radius"
@@ -65,9 +65,9 @@  gdb_test "complete ptype pck.c" "ptype pck\\.circle"
 # We can't query the members of a package yet, and this yields a bit
 # too much output, so comment out for now instead of kfailing.
 # gdb_test "complete ptype pck." \
-#     [multi_line \
-# 	 "ptype pck\\.circle" \
-# 	 "ptype pck\\.position"]
+    #     [multi_line \
+    # 	 "ptype pck\\.circle" \
+    # 	 "ptype pck\\.position"]
 
 gdb_test "complete ptype circle.pos." \
     [multi_line \
diff --git a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
index 389f172324c..c2a20c97e8d 100644
--- a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
+++ b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 set has_runtime_debug_info [gnat_runtime_has_debug_info]
@@ -28,7 +28,7 @@  set has_runtime_debug_info [gnat_runtime_has_debug_info]
 clean_restart ${testfile}
 
 if {![runto "pck.adb:20"]} {
-  return
+    return
 }
 
 # With some versions of the compiler, identifying the runtime type of
diff --git a/gdb/testsuite/gdb.ada/py_range.exp b/gdb/testsuite/gdb.ada/py_range.exp
index 5e48c747e3b..f4fc0ab30c7 100644
--- a/gdb/testsuite/gdb.ada/py_range.exp
+++ b/gdb/testsuite/gdb.ada/py_range.exp
@@ -21,7 +21,7 @@  require allow_ada_tests allow_python_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -30,13 +30,13 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
 gdb_test "python print(int(gdb.parse_and_eval('sr')))" \
-	 "48"
+    "48"
 
 gdb_test "python print(int(gdb.parse_and_eval('si')))" \
-	 "740804"
+    "740804"
 
 gdb_test "python print(int(gdb.parse_and_eval('ir')))" \
-	 "974"
+    "974"
 
 # Accept "foo." prefix for older versions of GNAT.
 gdb_test "python print(gdb.parse_and_eval('si').type)" \
diff --git a/gdb/testsuite/gdb.ada/rdv_wait.exp b/gdb/testsuite/gdb.ada/rdv_wait.exp
index 479f6107ec3..b78e45cc811 100644
--- a/gdb/testsuite/gdb.ada/rdv_wait.exp
+++ b/gdb/testsuite/gdb.ada/rdv_wait.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -33,8 +33,8 @@  runto "break_me"
 # Switch to task 2, and verify that GDB is able to unwind all the way
 # to foo.T.
 gdb_test "task 2" \
-	 [join {"\\\[Switching to task 2 \"mit\"\\\].*" \
-		".*foo\\.t \\(.*\\).*foo\\.adb:.*"} ""]
+    [join {"\\\[Switching to task 2 \"mit\"\\\].*" \
+	       ".*foo\\.t \\(.*\\).*foo\\.adb:.*"} ""]
 
 gdb_test "task apply 1 -q frame" ".*pck\\.break_me.*"
 
diff --git a/gdb/testsuite/gdb.ada/rec_comp.exp b/gdb/testsuite/gdb.ada/rec_comp.exp
index af49495b875..1e62cceba38 100644
--- a/gdb/testsuite/gdb.ada/rec_comp.exp
+++ b/gdb/testsuite/gdb.ada/rec_comp.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile bar_o203_012
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/bar_o203_012.adb]
 if {![runto "bar_o203_012.adb:$bp_location"]} {
-  return
+    return
 }
 
 # Accept "bar_o203_012." prefix for older versions of GNAT.
diff --git a/gdb/testsuite/gdb.ada/rec_return.exp b/gdb/testsuite/gdb.ada/rec_return.exp
index 3bba420583f..ef7eabaa956 100644
--- a/gdb/testsuite/gdb.ada/rec_return.exp
+++ b/gdb/testsuite/gdb.ada/rec_return.exp
@@ -20,15 +20,15 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print bar" \
-	 "= \\(x => 42, s => \"ABCDEFGH\"\\)"
+    "= \\(x => 42, s => \"ABCDEFGH\"\\)"
diff --git a/gdb/testsuite/gdb.ada/ref_param.exp b/gdb/testsuite/gdb.ada/ref_param.exp
index e3262988082..90e4c269a6a 100644
--- a/gdb/testsuite/gdb.ada/ref_param.exp
+++ b/gdb/testsuite/gdb.ada/ref_param.exp
@@ -20,18 +20,18 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto pck.adb:20]} {
-  return
+    return
 }
 
 gdb_test_no_output "set print frame-arguments all"
 
 set expected_d "\\(one => 1, two => 2, three => 3, four => 4, five => 5, six => 6\\)"
 gdb_test "frame" \
-	 "#0\[ \t\]*pck\\.call_me \\(d=${expected_d}\\).*"  \
-	 "frame argument value printed"
+    "#0\[ \t\]*pck\\.call_me \\(d=${expected_d}\\).*"  \
+    "frame argument value printed"
diff --git a/gdb/testsuite/gdb.ada/ref_tick_size.exp b/gdb/testsuite/gdb.ada/ref_tick_size.exp
index c39c216b1c2..cc7484a450c 100644
--- a/gdb/testsuite/gdb.ada/ref_tick_size.exp
+++ b/gdb/testsuite/gdb.ada/ref_tick_size.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,4 +34,4 @@  runto "p.adb:$bp_location"
 # the size of d1.
 
 gdb_test "print d1'size = d2'size" \
-	 "= true"
+    "= true"
diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
index 5e762f5f2ec..ac39ca19041 100644
--- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp
+++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
@@ -22,7 +22,7 @@  require {gnat_version_compare >= 8}
 standard_ada_testfile pb30_012
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,18 +31,18 @@  set bp_location [gdb_get_line_number "BREAK" ${testdir}/pkg.adb]
 runto "pkg.adb:$bp_location"
 
 gdb_test "print rename_subscript_param_b" \
-	 " = false" \
-	 "print rename_subscript_param_b before changing its value"
+    " = false" \
+    "print rename_subscript_param_b before changing its value"
 
 set bp_location [gdb_get_line_number "Do_Nothing" ${testdir}/pkg.adb]
 gdb_test "break pkg.adb:$bp_location" \
-	 "Breakpoint \[0-9\]+ at.*: file .*pkg.adb, line \[0-9\]+." \
-	 "insert second breakpoint in pkg.adb"
+    "Breakpoint \[0-9\]+ at.*: file .*pkg.adb, line \[0-9\]+." \
+    "insert second breakpoint in pkg.adb"
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+, pkg.flip \\(.*" \
-	 "Continuing to breakpoint on call to Do_Nothing"
+    "Breakpoint \[0-9\]+, pkg.flip \\(.*" \
+    "Continuing to breakpoint on call to Do_Nothing"
 
 gdb_test "print rename_subscript_param_b" \
-	 " = true" \
-	 "print rename_subscript_param_b after changing its value"
+    " = true" \
+    "print rename_subscript_param_b after changing its value"
diff --git a/gdb/testsuite/gdb.ada/repeat_dyn.exp b/gdb/testsuite/gdb.ada/repeat_dyn.exp
index a866e175714..60fe4efb77d 100644
--- a/gdb/testsuite/gdb.ada/repeat_dyn.exp
+++ b/gdb/testsuite/gdb.ada/repeat_dyn.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_oc22_002
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,4 +29,4 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_oc22_002.adb]
 runto "foo_oc22_002.adb:$bp_location"
 
 gdb_test "print a1(1)@3" \
-	 " = \\(3, 5, 8\\)"
+    " = \\(3, 5, 8\\)"
diff --git a/gdb/testsuite/gdb.ada/return-small-char-array.exp b/gdb/testsuite/gdb.ada/return-small-char-array.exp
index 63009bed2df..948dd1085a8 100644
--- a/gdb/testsuite/gdb.ada/return-small-char-array.exp
+++ b/gdb/testsuite/gdb.ada/return-small-char-array.exp
@@ -26,7 +26,7 @@  if { [ada_fvar_tracking] } {
 }
 
 if { [gdb_compile_ada $srcfile $binfile executable $opts] != "" } {
-  return
+    return
 }
 
 clean_restart $testfile
diff --git a/gdb/testsuite/gdb.ada/same_enum.exp b/gdb/testsuite/gdb.ada/same_enum.exp
index 7e233cd91e7..959eadef5c0 100644
--- a/gdb/testsuite/gdb.ada/same_enum.exp
+++ b/gdb/testsuite/gdb.ada/same_enum.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile a
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp
index a3805410882..97310851619 100644
--- a/gdb/testsuite/gdb.ada/scalar_storage.exp
+++ b/gdb/testsuite/gdb.ada/scalar_storage.exp
@@ -42,7 +42,7 @@  clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/storage.adb]
 if {![runto "storage.adb:$bp_location"]} {
-  return
+    return
 }
 
 set re "value => 126, another_value => 12, color => green"
diff --git a/gdb/testsuite/gdb.ada/scoped_watch.exp b/gdb/testsuite/gdb.ada/scoped_watch.exp
index 03526a2e080..e9dd188af32 100644
--- a/gdb/testsuite/gdb.ada/scoped_watch.exp
+++ b/gdb/testsuite/gdb.ada/scoped_watch.exp
@@ -31,27 +31,27 @@  runto "pck.adb:$bp_location"
 # Insert a watchpoint on local variable "result"
 
 gdb_test "watch result" \
-	 ".*atchpoint \[0-9\]+: result"
+    ".*atchpoint \[0-9\]+: result"
 
 # Insert a breakpoint we'll reach after returning from the current
 # function.
 
 set bp_location [gdb_get_line_number "Do_Nothing" ${testdir}/foo_p708_025.adb]
 gdb_test "break foo_p708_025.adb:$bp_location" \
-	 "Breakpoint \[0-9\]+ at.*: file .*foo_p708_025.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at.*: file .*foo_p708_025.adb, line \[0-9\]+."
 
 # This breakpoint will be there to stop us after we test what happens
 # during a continue (see below...)
 
 gdb_test "break pck.increment" \
-	 "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+."
+    "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+."
 
 # Continue until we reach our watchpoint.  It isn't strictly necessary
 # for our purpose that the watchpoint actually triggers, but this shows
 # that the watchpoint exists and is active.
 gdb_test "cont" \
-	 ".*atchpoint \[0-9\]+: result.*Old value = 8.*New value = 64.*" \
-	 "continuing to watchpoint hit"
+    ".*atchpoint \[0-9\]+: result.*Old value = 8.*New value = 64.*" \
+    "continuing to watchpoint hit"
 
 # Continue again.  We should be stopped at the (internal) breakpoint
 # that we setup to delete the watchpoint as soon as the program leaves
@@ -66,18 +66,18 @@  gdb_test \
 # (on the call to Do_Nothing) we set earlier.
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+.*Do_Nothing.*" \
-	 "continuing to breakpoint on call to Do_Nothing"
+    "Breakpoint \[0-9\]+.*Do_Nothing.*" \
+    "continuing to breakpoint on call to Do_Nothing"
 
 # Do a next, to verify that it works...
 
 gdb_test "next" \
-	 ".* Call_Me;" \
-	 "next to call to Call_Me"
+    ".* Call_Me;" \
+    "next to call to Call_Me"
 
 # And finally, one more continue.
 
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+.*pck\\.increment.*" \
-	 "continuing to breakpoint in pck.increment"
+    "Breakpoint \[0-9\]+.*pck\\.increment.*" \
+    "continuing to breakpoint in pck.increment"
diff --git a/gdb/testsuite/gdb.ada/set_wstr.exp b/gdb/testsuite/gdb.ada/set_wstr.exp
index 07c81ab63d3..7e5744b1329 100644
--- a/gdb/testsuite/gdb.ada/set_wstr.exp
+++ b/gdb/testsuite/gdb.ada/set_wstr.exp
@@ -20,51 +20,51 @@  require allow_ada_tests
 standard_ada_testfile a
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/a.adb]
 if {![runto "a.adb:$bp_location"]} {
-  return
+    return
 }
 
 # Verify that assigning to Nnn (a basic string) works...
 
 gdb_test "print nnn" \
-	 "= \"12345\"" \
-	 "print nnn before assignment"
+    "= \"12345\"" \
+    "print nnn before assignment"
 
 gdb_test_no_output "set variable nnn := \"qcyom\""
 
 gdb_test "print nnn" \
-	 "= \"qcyom\"" \
-	 "print nnn after assignment"
+    "= \"qcyom\"" \
+    "print nnn after assignment"
 
 # Same with Www (a wide string)...
 
 gdb_test "print www" \
-	 "= \"12345\"" \
-	 "print www before assignment"
+    "= \"12345\"" \
+    "print www before assignment"
 
 gdb_test_no_output "set variable www := \"zenrk\""
 
 gdb_test "print www" \
-	 "= \"zenrk\"" \
-	 "print www after assignment"
+    "= \"zenrk\"" \
+    "print www after assignment"
 
 # Same with Rws (a wide wide string)...
 
 gdb_test "print rws" \
-	 "= \"12345\"" \
-	 "print rws before assignment"
+    "= \"12345\"" \
+    "print rws before assignment"
 
 gdb_test_no_output "set variable rws := \"ndhci\""
 
 gdb_test "print rws" \
-	 "= \"ndhci\"" \
-	 "print rws after assignment"
+    "= \"ndhci\"" \
+    "print rws after assignment"
 
 # Also, check that GDB doesn't get tricked if we assign to Www a
 # string twice the length of Www.  The debugger should reject the
@@ -72,7 +72,7 @@  gdb_test "print rws" \
 # used to get tricked because the array size was the same).
 
 gdb_test "set variable www := \"1#2#3#4#5#\"" \
-	 "cannot assign arrays of different length"
+    "cannot assign arrays of different length"
 
 # However, reassigning an array of a different length should work when
 # the LHS is a convenience variable.
diff --git a/gdb/testsuite/gdb.ada/small_reg_param.exp b/gdb/testsuite/gdb.ada/small_reg_param.exp
index 119e561bd02..8499c173d7c 100644
--- a/gdb/testsuite/gdb.ada/small_reg_param.exp
+++ b/gdb/testsuite/gdb.ada/small_reg_param.exp
@@ -20,13 +20,13 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-O1]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 if {![runto_main]} {
-  return
+    return
 }
 
 gdb_breakpoint "call_me"
diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp
index 9138030aef0..0829741f55c 100644
--- a/gdb/testsuite/gdb.ada/start.exp
+++ b/gdb/testsuite/gdb.ada/start.exp
@@ -36,5 +36,5 @@  if { [gdb_start_cmd] < 0 } {
 }
 
 gdb_test "" \
-	 "dummy \\(\\) at .*dummy.adb.*" \
-	 "start"
+    "dummy \\(\\) at .*dummy.adb.*" \
+    "start"
diff --git a/gdb/testsuite/gdb.ada/static-link.exp b/gdb/testsuite/gdb.ada/static-link.exp
index 1b05bcdafe0..44fe0dfb67d 100644
--- a/gdb/testsuite/gdb.ada/static-link.exp
+++ b/gdb/testsuite/gdb.ada/static-link.exp
@@ -27,7 +27,7 @@  clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/prog.adb]
 if {![runto "prog.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "ptype value" [string_to_regexp "type = array (1 .. 3) of integer"]
diff --git a/gdb/testsuite/gdb.ada/str_binop_equal.exp b/gdb/testsuite/gdb.ada/str_binop_equal.exp
index 85cf9cb0e41..a392db18909 100644
--- a/gdb/testsuite/gdb.ada/str_binop_equal.exp
+++ b/gdb/testsuite/gdb.ada/str_binop_equal.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_p211_061
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,13 +29,13 @@  set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_p211_061.adb]
 runto "foo_p211_061.adb:$bp_location"
 
 gdb_test "print my_str = my_str" \
-	 " = true"
+    " = true"
 
 gdb_test "print my_str = \"ABCD\"" \
     " = true"
 
 gdb_test "print my_str = \"EFGH\"" \
-	 " = false"
+    " = false"
 
 gdb_test "print my_str = \"AB\"" \
-	 " = false"
+    " = false"
diff --git a/gdb/testsuite/gdb.ada/str_chars.exp b/gdb/testsuite/gdb.ada/str_chars.exp
index edd82e634f5..5751ca2e4a3 100644
--- a/gdb/testsuite/gdb.ada/str_chars.exp
+++ b/gdb/testsuite/gdb.ada/str_chars.exp
@@ -22,7 +22,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/str_ref_cmp.exp b/gdb/testsuite/gdb.ada/str_ref_cmp.exp
index b2bb976f16c..4ad40b7d2d2 100644
--- a/gdb/testsuite/gdb.ada/str_ref_cmp.exp
+++ b/gdb/testsuite/gdb.ada/str_ref_cmp.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -44,7 +44,7 @@  gdb_test_multiple {print "a" = "a"} $test {
 # Verify that we can compare a string slice with another string.
 
 gdb_test "print String_Var (1 .. 3) = \"Hel\"" \
-	 "= true"
+    "= true"
 
 gdb_test "print String_Var (1 .. 3) = \"hel\"" \
-	 "= false"
+    "= false"
diff --git a/gdb/testsuite/gdb.ada/str_uninit.exp b/gdb/testsuite/gdb.ada/str_uninit.exp
index 1157ef8b9b6..4a36371ccd3 100644
--- a/gdb/testsuite/gdb.ada/str_uninit.exp
+++ b/gdb/testsuite/gdb.ada/str_uninit.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile parse
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/parse.adb]
 if {![runto "parse.adb:$bp_location"]} {
-  return
+    return
 }
 
 # Print MY_STR.  Since the string has not been initialized, including
diff --git a/gdb/testsuite/gdb.ada/sub_variant.exp b/gdb/testsuite/gdb.ada/sub_variant.exp
index b3c800f84fb..4452437400d 100644
--- a/gdb/testsuite/gdb.ada/sub_variant.exp
+++ b/gdb/testsuite/gdb.ada/sub_variant.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile subv
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/sym_print_name.exp b/gdb/testsuite/gdb.ada/sym_print_name.exp
index 9e4a38bb5df..b3861209d1f 100644
--- a/gdb/testsuite/gdb.ada/sym_print_name.exp
+++ b/gdb/testsuite/gdb.ada/sym_print_name.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -36,17 +36,17 @@  set menu [multi_line "Multiple matches for integervar" \
 
 set test_name "multiple matches for symbol integervar"
 gdb_test_multiple "print integervar" "$test_name" \
-{
-      -re "$menu" {
-	  pass "$test_name"
-      }
-
-      default {
-	  fail "$test_name"
-      }
-}
+    {
+	-re "$menu" {
+	    pass "$test_name"
+	}
+
+	default {
+	    fail "$test_name"
+	}
+    }
 
 # Select the first choice from the multiple-choice menu above.
 gdb_test "1" \
-	 "= 48" \
-	 "select first choice from multiple-choice menu"
+    "= 48" \
+    "select first choice from multiple-choice menu"
diff --git a/gdb/testsuite/gdb.ada/taft_type.exp b/gdb/testsuite/gdb.ada/taft_type.exp
index c07f5b144ea..e2a4f982a9b 100644
--- a/gdb/testsuite/gdb.ada/taft_type.exp
+++ b/gdb/testsuite/gdb.ada/taft_type.exp
@@ -20,15 +20,15 @@  require allow_ada_tests
 standard_ada_testfile p
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
 if {![runto "p.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print w.e.all" \
-	 "= \\(month => 8, year => 1974\\)"
+    "= \\(month => 8, year => 1974\\)"
diff --git a/gdb/testsuite/gdb.ada/tagged-lookup.exp b/gdb/testsuite/gdb.ada/tagged-lookup.exp
index 726ead24cef..52b153f82f3 100644
--- a/gdb/testsuite/gdb.ada/tagged-lookup.exp
+++ b/gdb/testsuite/gdb.ada/tagged-lookup.exp
@@ -23,7 +23,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp
index 20f1e334079..56e5c7468d8 100644
--- a/gdb/testsuite/gdb.ada/tagged.exp
+++ b/gdb/testsuite/gdb.ada/tagged.exp
@@ -22,7 +22,7 @@  require gnat_runtime_has_debug_info
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -34,19 +34,19 @@  runto "foo.adb:$bp_location"
 # class-wide.
 
 gdb_test "ptype segm" \
-	 [multi_line "type = new pck\\.object with record" \
-		     "    width: integer;" \
-		     "end record" ]
+    [multi_line "type = new pck\\.object with record" \
+	 "    width: integer;" \
+	 "end record" ]
 
 gdb_test "print segm" \
-	 "= \\(position => 74, width => 8\\)"
+    "= \\(position => 74, width => 8\\)"
 
 # Now, test printing of an class-wide object.
 
 gdb_test "ptype obj" \
-	 [multi_line "type = new pck\\.object with record" \
-		     "    width: integer;" \
-		     "end record" ]
+    [multi_line "type = new pck\\.object with record" \
+	 "    width: integer;" \
+	 "end record" ]
 
 gdb_test "print obj" \
-	 "= \\(position => 74, width => 8\\)"
+    "= \\(position => 74, width => 8\\)"
diff --git a/gdb/testsuite/gdb.ada/task_bp.exp b/gdb/testsuite/gdb.ada/task_bp.exp
index de96082ba10..98bd41e3aa8 100644
--- a/gdb/testsuite/gdb.ada/task_bp.exp
+++ b/gdb/testsuite/gdb.ada/task_bp.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 # Insert a breakpoint at LOC, and run the program expecting us to
@@ -36,18 +36,18 @@  if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" }
 # order to test one given linespec under multiple conditions.
 
 proc test_bp { loc msg } {
-   gdb_test "break $loc" \
-     "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*pck.adb, line \[0-9\]+\\." \
-     "break $loc - $msg"
+    gdb_test "break $loc" \
+	"Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*pck.adb, line \[0-9\]+\\." \
+	"break $loc - $msg"
 
-   gdb_run_cmd
-   gdb_test "" \
-     "Breakpoint \[0-9\]+, pck\\.dummy_task (.*)" \
-     "run to $loc - $msg"
+    gdb_run_cmd
+    gdb_test "" \
+	"Breakpoint \[0-9\]+, pck\\.dummy_task (.*)" \
+	"run to $loc - $msg"
 }
 
 set all_linespecs { "pck.dummy_task" "dummy_task"
-		    "pck.adb:pck.dummy_task" "pck.adb:dummy_task"}
+    "pck.adb:pck.dummy_task" "pck.adb:dummy_task"}
 
 # First, test the linespecs when the associated symtab hasn't been
 # expanded yet.
diff --git a/gdb/testsuite/gdb.ada/task_switch_in_core.exp b/gdb/testsuite/gdb.ada/task_switch_in_core.exp
index cb04c749aca..9e4f544f4d7 100644
--- a/gdb/testsuite/gdb.ada/task_switch_in_core.exp
+++ b/gdb/testsuite/gdb.ada/task_switch_in_core.exp
@@ -20,7 +20,7 @@  require allow_ada_tests gcore_cmd_available
 standard_ada_testfile crash
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -38,7 +38,7 @@  if {![runto request_for_crash]} {
 set corefile [standard_output_file crash.gcore]
 set core_supported [gdb_gcore_cmd "$corefile" "save a corefile"]
 if {!$core_supported} {
-  return
+    return
 }
 
 # Now that the core file has been created, we can start the real
@@ -56,14 +56,14 @@  if { $core_loaded == -1 } {
 # First, switch to task 1.
 
 gdb_test "task 1" \
-	 "crash\\.request_for_crash \\(\\) at .*crash\\.adb:$decimal.*"
+    "crash\\.request_for_crash \\(\\) at .*crash\\.adb:$decimal.*"
 
 
 gdb_test "info tasks" \
-	 [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \
-		     "\\*\\s+1\\s+.*main_task" \
-		     "\\s+2.*my_t"] \
-	 "info tasks after switching to task 1"
+    [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \
+	 "\\*\\s+1\\s+.*main_task" \
+	 "\\s+2.*my_t"] \
+    "info tasks after switching to task 1"
 
 # Switch to task 2. Unlike in the case where we tested the switch to
 # task 1, don't check the location where the debugger says the program
@@ -73,10 +73,10 @@  gdb_test "info tasks" \
 # we will verify right after with an additional test that the current
 # task is now task 2.
 gdb_test "task 2" \
-	 "\\\[Switching to task 2 \"my_t\"\\\].*"
+    "\\\[Switching to task 2 \"my_t\"\\\].*"
 
 gdb_test "info tasks" \
-	 [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \
-		     "\\s+1\\s+.*main_task" \
-		     "\\*\\s+2.*my_t"] \
-	 "info tasks after switching to task 2"
+    [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \
+	 "\\s+1\\s+.*main_task" \
+	 "\\*\\s+2.*my_t"] \
+    "info tasks after switching to task 2"
diff --git a/gdb/testsuite/gdb.ada/task_watch.exp b/gdb/testsuite/gdb.ada/task_watch.exp
index 54c9f10c5ed..1d7652f887f 100644
--- a/gdb/testsuite/gdb.ada/task_watch.exp
+++ b/gdb/testsuite/gdb.ada/task_watch.exp
@@ -24,7 +24,7 @@  require allow_hw_watchpoint_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp
index e36edeaf83b..c01f0cbf14a 100644
--- a/gdb/testsuite/gdb.ada/tasks.exp
+++ b/gdb/testsuite/gdb.ada/tasks.exp
@@ -22,7 +22,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -33,13 +33,13 @@  runto "foo.adb:$bp_location"
 # Make sure that all tasks appear in the "info tasks" listing, and
 # that the active task is the environment task.
 gdb_test "info tasks" \
-	 [join {" +ID +TID P-ID Pri State +Name" \
-		"\\* +1 .* main_task" \
-		" +2 .* task_list\\(1\\)" \
-		" +3 .* task_list\\(2\\)" \
-		" +4 .* task_list\\(3\\)"} \
-	       "\r\n"] \
-	 "info tasks before inserting breakpoint"
+    [join {" +ID +TID P-ID Pri State +Name" \
+	       "\\* +1 .* main_task" \
+	       " +2 .* task_list\\(1\\)" \
+	       " +3 .* task_list\\(2\\)" \
+	       " +4 .* task_list\\(3\\)"} \
+	 "\r\n"] \
+    "info tasks before inserting breakpoint"
 
 # Confirm that the "info threads" output lines up with the tasks list.
 gdb_test "info threads" \
@@ -159,19 +159,19 @@  if {[allow_guile_tests]} {
 # task 3 will hit our breakpoint, and GDB is expected to stop at that
 # point.  Also make sure that GDB reports the correct breakpoint number.
 gdb_test "continue" \
-	 ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \
-	 "continue to breakpoint"
+    ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \
+    "continue to breakpoint"
 
 # Check that it is indeed task 3 that hit the breakpoint by checking
 # which is the active task.
 gdb_test "info tasks" \
-	 [join {" +ID +TID P-ID Pri State +Name" \
-		" +1 .* main_task" \
-		" +2 .* task_list\\(1\\)" \
-		"\\* +3 .* task_list\\(2\\)" \
-		" +4 .* task_list\\(3\\)"} \
-	       "\r\n"] \
-	 "info tasks after hitting breakpoint"
+    [join {" +ID +TID P-ID Pri State +Name" \
+	       " +1 .* main_task" \
+	       " +2 .* task_list\\(1\\)" \
+	       "\\* +3 .* task_list\\(2\\)" \
+	       " +4 .* task_list\\(3\\)"} \
+	 "\r\n"] \
+    "info tasks after hitting breakpoint"
 
 # Now, resume the execution and make sure that GDB does not stop when
 # task 4 hits the breakpoint. Continuing thus results in our program
diff --git a/gdb/testsuite/gdb.ada/tick_last_segv.exp b/gdb/testsuite/gdb.ada/tick_last_segv.exp
index 0ad2ef860eb..cadb68e8d7e 100644
--- a/gdb/testsuite/gdb.ada/tick_last_segv.exp
+++ b/gdb/testsuite/gdb.ada/tick_last_segv.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -31,9 +31,9 @@  clean_restart ${testfile}
 # The actual value printed is of no interest in this testcase.
 
 gdb_test "print short_integer'first" \
-	 "= -\[0-9\]+" \
-	 "print short-integer'first"
+    "= -\[0-9\]+" \
+    "print short-integer'first"
 
 gdb_test "print short_integer'last" \
-	 "= \[0-9\]+" \
-	 "print short-integer'last"
+    "= \[0-9\]+" \
+    "print short-integer'last"
diff --git a/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp b/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp
index 0f560b277c0..976f808abd7 100644
--- a/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp
+++ b/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_n207_004
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/type_coercion.exp b/gdb/testsuite/gdb.ada/type_coercion.exp
index 201e4c045d4..d58cc5ac162 100644
--- a/gdb/testsuite/gdb.ada/type_coercion.exp
+++ b/gdb/testsuite/gdb.ada/type_coercion.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile assign
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -29,19 +29,19 @@  set bp_location [gdb_get_line_number "START" ${testdir}/assign.adb]
 runto "assign.adb:$bp_location"
 
 gdb_test "p q" \
-	 "= \\(2, 3, 5, 7, 11\\)" "initial value of q"
+    "= \\(2, 3, 5, 7, 11\\)" "initial value of q"
 
 gdb_test_no_output "set \$addr := q'address" \
-	 "save q'address in convenience variable"
+    "save q'address in convenience variable"
 
 gdb_test "p {Integer} \$addr" \
-	 "= 2" \
-	 "print {Integer} \$addr"
+    "= 2" \
+    "print {Integer} \$addr"
 
 # Now change the value at $addr using the same "{TYPE}" syntax.
 
 gdb_test_no_output "set {Integer} \$addr := 19" \
-	 "set {Integer} \$addr := 19"
+    "set {Integer} \$addr := 19"
 
 gdb_test "p q" \
-	 "= \\(19, 3, 5, 7, 11\\)" "modified value of q"
+    "= \\(19, 3, 5, 7, 11\\)" "modified value of q"
diff --git a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
index 4cec919c363..1c0f02fc7e5 100644
--- a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
+++ b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile parse
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/uninitialized_vars.exp b/gdb/testsuite/gdb.ada/uninitialized_vars.exp
index f01c7ca8382..6eba042b79d 100644
--- a/gdb/testsuite/gdb.ada/uninitialized_vars.exp
+++ b/gdb/testsuite/gdb.ada/uninitialized_vars.exp
@@ -23,7 +23,7 @@  require allow_ada_tests
 standard_ada_testfile parse
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -35,4 +35,4 @@  runto "parse.adb:$bp_location"
 
 # Check that printing uninitialized variables does not crash the debugger.
 gdb_test "info locals" \
-	 ".*"
+    ".*"
diff --git a/gdb/testsuite/gdb.ada/unsigned_last.exp b/gdb/testsuite/gdb.ada/unsigned_last.exp
index 3e0b96f6efa..b0ef9ec13b6 100644
--- a/gdb/testsuite/gdb.ada/unsigned_last.exp
+++ b/gdb/testsuite/gdb.ada/unsigned_last.exp
@@ -23,7 +23,7 @@  require allow_ada_tests
 standard_ada_testfile main
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/var_arr_attrs.exp b/gdb/testsuite/gdb.ada/var_arr_attrs.exp
index 05faf9360cb..e7b70fedb5d 100644
--- a/gdb/testsuite/gdb.ada/var_arr_attrs.exp
+++ b/gdb/testsuite/gdb.ada/var_arr_attrs.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile foo_o115_002
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/var_arr_typedef.exp b/gdb/testsuite/gdb.ada/var_arr_typedef.exp
index 8b525833636..303ea35bf58 100644
--- a/gdb/testsuite/gdb.ada/var_arr_typedef.exp
+++ b/gdb/testsuite/gdb.ada/var_arr_typedef.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile var_arr_typedef
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
@@ -37,10 +37,10 @@  set vb "\\($rb, $rb, $ra, $ra\\)"
 set a "\\($va, $va, $vb, $vb\\)"
 
 gdb_test "print va" \
-	 " = $va"
+    " = $va"
 
 gdb_test "print vb" \
-	 " = $vb"
+    " = $vb"
 
 gdb_test "print a" \
-	 " = $a"
+    " = $a"
diff --git a/gdb/testsuite/gdb.ada/variant-record.exp b/gdb/testsuite/gdb.ada/variant-record.exp
index 338b4fb9134..69bfcfb95a6 100644
--- a/gdb/testsuite/gdb.ada/variant-record.exp
+++ b/gdb/testsuite/gdb.ada/variant-record.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile proc
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/variant_record_field.exp b/gdb/testsuite/gdb.ada/variant_record_field.exp
index 13088104edb..89a4fd5bf68 100644
--- a/gdb/testsuite/gdb.ada/variant_record_field.exp
+++ b/gdb/testsuite/gdb.ada/variant_record_field.exp
@@ -32,7 +32,7 @@  standard_ada_testfile foo
 # making guarantees beyond -Og though, so test that.
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-Og]] != ""} {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/varsize_limit.exp b/gdb/testsuite/gdb.ada/varsize_limit.exp
index 171b2e446af..bc42aaf4617 100644
--- a/gdb/testsuite/gdb.ada/varsize_limit.exp
+++ b/gdb/testsuite/gdb.ada/varsize_limit.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile vsizelim
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/vsizelim.adb]
 if {![runto "vsizelim.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "set varsize-limit 16" \
diff --git a/gdb/testsuite/gdb.ada/vla.exp b/gdb/testsuite/gdb.ada/vla.exp
index dc418d864e7..8ebb0fa57f9 100644
--- a/gdb/testsuite/gdb.ada/vla.exp
+++ b/gdb/testsuite/gdb.ada/vla.exp
@@ -29,10 +29,10 @@  set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/vla.adb]
 runto "vla.adb:$bp_location"
 
 gdb_test "print r00" \
-	 "= \\(l1 => 0, l2 => 0, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(\\), i3 => 3\\)"
+    "= \\(l1 => 0, l2 => 0, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(\\), i3 => 3\\)"
 gdb_test "print r01" \
-	 "= \\(l1 => 0, l2 => 1, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(20\\), i3 => 3\\)"
+    "= \\(l1 => 0, l2 => 1, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(20\\), i3 => 3\\)"
 gdb_test "print r10" \
-	 "= \\(l1 => 1, l2 => 0, i1 => 1, a1 => \\(10\\), i2 => 2, a2 => \\(\\), i3 => 3\\)"
+    "= \\(l1 => 1, l2 => 0, i1 => 1, a1 => \\(10\\), i2 => 2, a2 => \\(\\), i3 => 3\\)"
 gdb_test "print r22" \
-	 "= \\(l1 => 2, l2 => 2, i1 => 1, a1 => \\(10, 10\\), i2 => 2, a2 => \\(20, 20\\), i3 => 3\\)"
+    "= \\(l1 => 2, l2 => 2, i1 => 1, a1 => \\(10, 10\\), i2 => 2, a2 => \\(20, 20\\), i3 => 3\\)"
diff --git a/gdb/testsuite/gdb.ada/voidctx.exp b/gdb/testsuite/gdb.ada/voidctx.exp
index c48f51c8046..7f79ece395b 100644
--- a/gdb/testsuite/gdb.ada/voidctx.exp
+++ b/gdb/testsuite/gdb.ada/voidctx.exp
@@ -20,7 +20,7 @@  require allow_ada_tests
 standard_ada_testfile voidctx
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/watch_arg.exp b/gdb/testsuite/gdb.ada/watch_arg.exp
index 7927f8a9a4b..b4435dd0a0f 100644
--- a/gdb/testsuite/gdb.ada/watch_arg.exp
+++ b/gdb/testsuite/gdb.ada/watch_arg.exp
@@ -31,14 +31,14 @@  runto "watch.adb:$bp_location"
 # Insert a watchpoint on argument X
 
 gdb_test "watch x" \
-	 ".*atchpoint \[0-9\]+: x" \
-	 "set watchpoint on function argument X"
+    ".*atchpoint \[0-9\]+: x" \
+    "set watchpoint on function argument X"
 
 # Then insert a breakpoint at the location we'd like to continue to...
 set bp_location [gdb_get_line_number "BREAK2" ${testdir}/watch.adb]
 gdb_test "break watch.adb:$bp_location" \
-	 "Breakpoint \[0-9\]+ at.*: file .*watch.adb, line \[0-9\]+." \
-	 "insert second breakpoint in watch.adb"
+    "Breakpoint \[0-9\]+ at.*: file .*watch.adb, line \[0-9\]+." \
+    "insert second breakpoint in watch.adb"
 
 # Continue again.  We should be stopped at the (internal) breakpoint
 # that we setup to delete the watchpoint as soon as the program leaves
@@ -53,5 +53,5 @@  gdb_test \
 # we inserted.
 
 gdb_test "cont" \
-	 "Breakpoint \[0-9\]+, watch \\(\\).*" \
-	 "continuing to second breakpoint"
+    "Breakpoint \[0-9\]+, watch \\(\\).*" \
+    "continuing to second breakpoint"
diff --git a/gdb/testsuite/gdb.ada/watch_minus_l.exp b/gdb/testsuite/gdb.ada/watch_minus_l.exp
index 7cda58c1e6c..29c89a5f49c 100644
--- a/gdb/testsuite/gdb.ada/watch_minus_l.exp
+++ b/gdb/testsuite/gdb.ada/watch_minus_l.exp
@@ -31,7 +31,7 @@  runto "foo_ra10_006.adb:$bp_location"
 # Insert a watchpoint on argument X
 
 gdb_test "watch -location pck.global_var" \
-	 ".*atchpoint \[0-9\]+: -location pck.global_var"
+    ".*atchpoint \[0-9\]+: -location pck.global_var"
 
 # Continue again.  We should be stopped at the (internal) breakpoint
 # that we setup to delete the watchpoint as soon as the program leaves
diff --git a/gdb/testsuite/gdb.ada/whatis_array_val.exp b/gdb/testsuite/gdb.ada/whatis_array_val.exp
index 78ca14cfcfc..ad8ca176f98 100644
--- a/gdb/testsuite/gdb.ada/whatis_array_val.exp
+++ b/gdb/testsuite/gdb.ada/whatis_array_val.exp
@@ -20,22 +20,22 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 # Accept "foo." prefix for older versions of GNAT.
 gdb_test "whatis full" \
-	 "type = (foo\\.)?full_table"
+    "type = (foo\\.)?full_table"
 
 gdb_test "print full" \
-	 " = \\(144, 233, 377, 610, 987\\)"
+    " = \\(144, 233, 377, 610, 987\\)"
 
 gdb_test "whatis $" \
-	 "type = (foo\\.)?full_table"
+    "type = (foo\\.)?full_table"
diff --git a/gdb/testsuite/gdb.ada/widewide.exp b/gdb/testsuite/gdb.ada/widewide.exp
index 722cf412c5d..749da6119a2 100644
--- a/gdb/testsuite/gdb.ada/widewide.exp
+++ b/gdb/testsuite/gdb.ada/widewide.exp
@@ -20,14 +20,14 @@  require allow_ada_tests
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 if {![runto "foo.adb:$bp_location"]} {
-  return
+    return
 }
 
 gdb_test "print some_easy" "= 74 'J'"
diff --git a/gdb/testsuite/gdb.ada/win_fu_syms.exp b/gdb/testsuite/gdb.ada/win_fu_syms.exp
index 837ea489335..f665cebeb28 100644
--- a/gdb/testsuite/gdb.ada/win_fu_syms.exp
+++ b/gdb/testsuite/gdb.ada/win_fu_syms.exp
@@ -21,17 +21,17 @@  require ada_shared_link
 standard_ada_testfile foo
 
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-shared additional_flags=-margs]] != "" } {
-  return
+    return
 }
 
 clean_restart ${testfile}
 
 set loc [gdb_get_line_number "Integer" ${testdir}/foo.adb]
 gdb_test "info line foo.adb:$loc" \
-	 "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \
-	 "info line on variable declaration"
+    "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \
+    "info line on variable declaration"
 
 set loc [gdb_get_line_number "Do_Nothing" ${testdir}/foo.adb]
 gdb_test "info line foo.adb:$loc" \
-	 "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \
-	 "info line on Do_Nothing call"
+    "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \
+    "info line on Do_Nothing call"