[PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt

Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed

* [PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt
@ 2026-03-25 16:13 Tom de Vries
  2026-03-25 16:13 ` [PATCH 1/2] [gdb] Update tclint.style in pyproject.toml Tom de Vries
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Tom de Vries @ 2026-03-25 16:13 UTC (permalink / raw)
  To: gdb-patches

I'd like to get to a situation where we use tclfmt as pre-commit formatter for
the testsuite, in the same way that we use say black and isort for python
files [1].

Of course that doesn't work if the changes are too intrusive, so I've been
working to get tclfmt to format in a style compatible with the gdb testsuite.

My test subject for this effort has been the gdb.ada directory.

With tcl 0.8.0, most issues are fixed, so this series:
- updates tclint.style in gdb/pyproject.toml to be less intrusive, and
- applies tclfmt to gdb.ada (manually reverting some changes that still need
  fixing in tclfmt).

[1] https://sourceware.org/bugzilla/show_bug.cgi?id=33724

Tom de Vries (2):
  [gdb] Update tclint.style in pyproject.toml
  [gdb/testsuite] Reformat gdb.ada using tclfmt

 gdb/pyproject.toml                            |  5 +++-
 gdb/testsuite/gdb.ada/access_tagged_param.exp |  2 +-
 .../gdb.ada/access_to_packed_array.exp        |  2 +-
 gdb/testsuite/gdb.ada/addr_arith.exp          |  2 +-
 gdb/testsuite/gdb.ada/arr_arr.exp             |  2 +-
 gdb/testsuite/gdb.ada/array_bounds.exp        |  2 +-
 .../gdb.ada/array_subscript_addr.exp          |  2 +-
 gdb/testsuite/gdb.ada/arraydim.exp            |  2 +-
 gdb/testsuite/gdb.ada/assign_1.exp            |  1 -
 gdb/testsuite/gdb.ada/assign_arr.exp          |  2 +-
 gdb/testsuite/gdb.ada/atomic_enum.exp         |  2 +-
 .../gdb.ada/attr_ref_and_charlit.exp          |  2 +-
 gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp |  2 +-
 gdb/testsuite/gdb.ada/bp_c_mixed_case.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_enum_homonym.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_inlined_func.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_on_var.exp           |  3 +--
 gdb/testsuite/gdb.ada/bp_range_type.exp       |  2 +-
 gdb/testsuite/gdb.ada/bp_reset.exp            |  2 +-
 gdb/testsuite/gdb.ada/call_pn.exp             |  2 +-
 gdb/testsuite/gdb.ada/catch_assert_if.exp     |  2 +-
 gdb/testsuite/gdb.ada/catch_ex.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          |  8 +++---
 gdb/testsuite/gdb.ada/complete.exp            | 16 ++++++------
 gdb/testsuite/gdb.ada/cond_lang.exp           |  2 +-
 gdb/testsuite/gdb.ada/convvar_comp.exp        |  2 +-
 gdb/testsuite/gdb.ada/delta-assign.exp        |  2 +-
 gdb/testsuite/gdb.ada/disc_arr_bound.exp      |  2 +-
 gdb/testsuite/gdb.ada/dot_all.exp             |  2 +-
 gdb/testsuite/gdb.ada/dyn_arrayidx.exp        |  2 +-
 gdb/testsuite/gdb.ada/dyn_loc.exp             |  2 +-
 gdb/testsuite/gdb.ada/dyn_stride.exp          |  2 +-
 gdb/testsuite/gdb.ada/dynamic-iface.exp       |  2 +-
 gdb/testsuite/gdb.ada/enums_overload.exp      |  2 +-
 gdb/testsuite/gdb.ada/excep_handle.exp        |  2 +-
 gdb/testsuite/gdb.ada/expr_delims.exp         |  4 +--
 gdb/testsuite/gdb.ada/expr_with_funcall.exp   | 14 +++++------
 gdb/testsuite/gdb.ada/exprs.exp               |  2 +-
 gdb/testsuite/gdb.ada/fin_fun_out.exp         |  2 +-
 .../gdb.ada/fixed_points_function.exp         |  2 +-
 gdb/testsuite/gdb.ada/float-bits.exp          |  9 +++----
 gdb/testsuite/gdb.ada/formatted_ref.exp       |  4 +--
 gdb/testsuite/gdb.ada/frame_args.exp          |  2 +-
 gdb/testsuite/gdb.ada/fullname_bp.exp         |  2 +-
 gdb/testsuite/gdb.ada/fun_addr.exp            |  2 +-
 gdb/testsuite/gdb.ada/fun_in_declare.exp      |  2 +-
 gdb/testsuite/gdb.ada/fun_overload_menu.exp   |  3 +--
 gdb/testsuite/gdb.ada/fun_renaming.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_char.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_param.exp       |  2 +-
 gdb/testsuite/gdb.ada/funcall_ptr.exp         |  2 +-
 gdb/testsuite/gdb.ada/ghost.exp               |  2 +-
 gdb/testsuite/gdb.ada/homonym.exp             |  3 +--
 .../gdb.ada/info_addr_mixed_case.exp          |  2 +-
 gdb/testsuite/gdb.ada/info_auto_lang.exp      | 25 +++++++++----------
 gdb/testsuite/gdb.ada/info_exc.exp            |  4 +--
 gdb/testsuite/gdb.ada/inline-section-gc.exp   |  1 -
 gdb/testsuite/gdb.ada/int_deref.exp           |  2 +-
 gdb/testsuite/gdb.ada/interface.exp           |  2 +-
 gdb/testsuite/gdb.ada/iterated-assign.exp     |  2 +-
 gdb/testsuite/gdb.ada/iwide.exp               |  2 +-
 gdb/testsuite/gdb.ada/lang_switch.exp         |  2 +-
 gdb/testsuite/gdb.ada/length_cond.exp         |  2 +-
 gdb/testsuite/gdb.ada/maint_with_ada.exp      |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_assert.exp     |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    |  3 +--
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  2 +-
 gdb/testsuite/gdb.ada/mi_exc_info.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_interface.exp        |  2 +-
 gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  2 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp        |  2 +-
 gdb/testsuite/gdb.ada/mi_var_access.exp       |  2 +-
 gdb/testsuite/gdb.ada/minsyms.exp             |  2 +-
 gdb/testsuite/gdb.ada/nested.exp              |  2 +-
 gdb/testsuite/gdb.ada/non-ascii-latin-3.exp   |  2 +-
 gdb/testsuite/gdb.ada/null_array.exp          |  2 +-
 gdb/testsuite/gdb.ada/operator_bp.exp         |  4 +--
 gdb/testsuite/gdb.ada/optim_drec.exp          |  2 +-
 gdb/testsuite/gdb.ada/packed_array_assign.exp |  2 +-
 gdb/testsuite/gdb.ada/pp-rec-component.exp    |  2 +-
 gdb/testsuite/gdb.ada/print_chars.exp         |  3 +--
 gdb/testsuite/gdb.ada/print_pc.exp            |  2 +-
 gdb/testsuite/gdb.ada/ptr_typedef.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_array.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_field.exp         |  6 ++---
 gdb/testsuite/gdb.ada/ptype_tagged_param.exp  |  2 +-
 gdb/testsuite/gdb.ada/py_range.exp            |  2 +-
 gdb/testsuite/gdb.ada/rdv_wait.exp            |  2 +-
 gdb/testsuite/gdb.ada/rec_comp.exp            |  2 +-
 gdb/testsuite/gdb.ada/rec_return.exp          |  2 +-
 gdb/testsuite/gdb.ada/ref_param.exp           |  4 +--
 gdb/testsuite/gdb.ada/ref_tick_size.exp       |  2 +-
 .../gdb.ada/rename_subscript_param.exp        |  2 +-
 gdb/testsuite/gdb.ada/repeat_dyn.exp          |  2 +-
 gdb/testsuite/gdb.ada/same_enum.exp           |  4 +--
 gdb/testsuite/gdb.ada/scoped_watch.exp        |  1 -
 gdb/testsuite/gdb.ada/set_wstr.exp            |  2 +-
 gdb/testsuite/gdb.ada/small_reg_param.exp     |  2 +-
 gdb/testsuite/gdb.ada/str_binop_equal.exp     |  2 +-
 gdb/testsuite/gdb.ada/str_chars.exp           |  2 +-
 gdb/testsuite/gdb.ada/str_ref_cmp.exp         |  2 +-
 gdb/testsuite/gdb.ada/str_uninit.exp          |  2 +-
 gdb/testsuite/gdb.ada/sub_variant.exp         |  2 +-
 gdb/testsuite/gdb.ada/sym_print_name.exp      |  2 +-
 gdb/testsuite/gdb.ada/taft_type.exp           |  2 +-
 gdb/testsuite/gdb.ada/tagged.exp              |  6 ++---
 gdb/testsuite/gdb.ada/task_bp.exp             |  2 +-
 gdb/testsuite/gdb.ada/task_switch_in_core.exp |  3 +--
 gdb/testsuite/gdb.ada/tasks.exp               |  2 +-
 gdb/testsuite/gdb.ada/tick_last_segv.exp      |  2 +-
 .../gdb.ada/tick_length_array_enum_idx.exp    |  2 +-
 gdb/testsuite/gdb.ada/type_coercion.exp       |  2 +-
 .../gdb.ada/uninitialized-variable-record.exp |  2 +-
 gdb/testsuite/gdb.ada/uninitialized_vars.exp  |  2 +-
 gdb/testsuite/gdb.ada/var_arr_attrs.exp       |  2 +-
 gdb/testsuite/gdb.ada/var_arr_typedef.exp     |  2 +-
 gdb/testsuite/gdb.ada/varsize_limit.exp       |  2 +-
 gdb/testsuite/gdb.ada/voidctx.exp             |  2 +-
 gdb/testsuite/gdb.ada/whatis_array_val.exp    |  2 +-
 gdb/testsuite/gdb.ada/widewide.exp            |  2 +-
 gdb/testsuite/gdb.ada/win_fu_syms.exp         |  2 +-
 126 files changed, 166 insertions(+), 174 deletions(-)


base-commit: 1a10ac99959e8d28694cb47d0632552e6feb03b2
-- 
2.51.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] [gdb] Update tclint.style in pyproject.toml
  2026-03-25 16:13 [PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
@ 2026-03-25 16:13 ` Tom de Vries
  2026-03-25 16:13 ` [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
  2026-04-10 12:35 ` [PING][PATCH 0/2] " Tom de Vries
  2 siblings, 0 replies; 6+ messages in thread
From: Tom de Vries @ 2026-03-25 16:13 UTC (permalink / raw)
  To: gdb-patches

Since tclint v0.8.0, tclfmt can use the following settings:
- spaces-in-braces = "balanced-no"
- emacs = true

These were added to reduce the amount of changes when reformatting gdb
testsuite files.

Add these to gdb/pyproject.toml.
---
 gdb/pyproject.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gdb/pyproject.toml b/gdb/pyproject.toml
index c8d1705ba15..5262ddb056e 100644
--- a/gdb/pyproject.toml
+++ b/gdb/pyproject.toml
@@ -39,4 +39,7 @@ max-blank-lines = 1
 indent-namespace-eval = true
 
 # Used by tclfmt.
-spaces-in-braces = false
+spaces-in-braces = "balanced-no"
+
+# Used by tclfmt.
+emacs = true
-- 
2.51.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt
  2026-03-25 16:13 [PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
  2026-03-25 16:13 ` [PATCH 1/2] [gdb] Update tclint.style in pyproject.toml Tom de Vries
@ 2026-03-25 16:13 ` Tom de Vries
  2026-03-25 16:42   ` Tom de Vries
  2026-03-31  6:49   ` Tom de Vries
  2026-04-10 12:35 ` [PING][PATCH 0/2] " Tom de Vries
  2 siblings, 2 replies; 6+ messages in thread
From: Tom de Vries @ 2026-03-25 16:13 UTC (permalink / raw)
  To: gdb-patches

This is the result of running:
...
$ tclfmt --in-place gdb/testsuite/gdb.ada
...

Because of not using --trust-plugins, gdb/testsuite/tclint-plugin.py is not
used.  If I add --trust-plugins, I run into this [1] problem:
...
-require allow_ada_tests
+require {allow_ada_tests}
...
which may be either a tclfmt problem, or a problem with the plugin.

I reverted the changes in gdb.ada/call-no-debug.exp, because they don't look
good:
...
 # Compile pck without debuginfo but prog with it.
-if {[gdb_compile_ada $srcdir/$subdir/$testdir/pck.adb \
-        [standard_output_file pck.o] object {}] != ""} {
+if {
+    [gdb_compile_ada $srcdir/$subdir/$testdir/pck.adb \
+        [standard_output_file pck.o] object {}] != ""
+} {
...

Likewise in:
- gdb.ada/catch_ex_std.exp
- gdb.ada/negative-bit-offset.exp
- gdb.ada/data-sections.exp
- gdb.ada/dgopt.exp
- gdb.ada/huge.exp
- gdb.ada/import.exp
- gdb.ada/limited-length.exp
- gdb.ada/mi_prot.exp

There's a tclfmt issue open about this [2].

Tested on aarch64-linux.

[1] https://github.com/nmoroze/tclint/issues/160
[2] https://github.com/nmoroze/tclint/issues/140
---
 gdb/testsuite/gdb.ada/access_tagged_param.exp |  2 +-
 .../gdb.ada/access_to_packed_array.exp        |  2 +-
 gdb/testsuite/gdb.ada/addr_arith.exp          |  2 +-
 gdb/testsuite/gdb.ada/arr_arr.exp             |  2 +-
 gdb/testsuite/gdb.ada/array_bounds.exp        |  2 +-
 .../gdb.ada/array_subscript_addr.exp          |  2 +-
 gdb/testsuite/gdb.ada/arraydim.exp            |  2 +-
 gdb/testsuite/gdb.ada/assign_1.exp            |  1 -
 gdb/testsuite/gdb.ada/assign_arr.exp          |  2 +-
 gdb/testsuite/gdb.ada/atomic_enum.exp         |  2 +-
 .../gdb.ada/attr_ref_and_charlit.exp          |  2 +-
 gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp |  2 +-
 gdb/testsuite/gdb.ada/bp_c_mixed_case.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_enum_homonym.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_inlined_func.exp     |  2 +-
 gdb/testsuite/gdb.ada/bp_on_var.exp           |  3 +--
 gdb/testsuite/gdb.ada/bp_range_type.exp       |  2 +-
 gdb/testsuite/gdb.ada/bp_reset.exp            |  2 +-
 gdb/testsuite/gdb.ada/call_pn.exp             |  2 +-
 gdb/testsuite/gdb.ada/catch_assert_if.exp     |  2 +-
 gdb/testsuite/gdb.ada/catch_ex.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          |  8 +++---
 gdb/testsuite/gdb.ada/complete.exp            | 16 ++++++------
 gdb/testsuite/gdb.ada/cond_lang.exp           |  2 +-
 gdb/testsuite/gdb.ada/convvar_comp.exp        |  2 +-
 gdb/testsuite/gdb.ada/delta-assign.exp        |  2 +-
 gdb/testsuite/gdb.ada/disc_arr_bound.exp      |  2 +-
 gdb/testsuite/gdb.ada/dot_all.exp             |  2 +-
 gdb/testsuite/gdb.ada/dyn_arrayidx.exp        |  2 +-
 gdb/testsuite/gdb.ada/dyn_loc.exp             |  2 +-
 gdb/testsuite/gdb.ada/dyn_stride.exp          |  2 +-
 gdb/testsuite/gdb.ada/dynamic-iface.exp       |  2 +-
 gdb/testsuite/gdb.ada/enums_overload.exp      |  2 +-
 gdb/testsuite/gdb.ada/excep_handle.exp        |  2 +-
 gdb/testsuite/gdb.ada/expr_delims.exp         |  4 +--
 gdb/testsuite/gdb.ada/expr_with_funcall.exp   | 14 +++++------
 gdb/testsuite/gdb.ada/exprs.exp               |  2 +-
 gdb/testsuite/gdb.ada/fin_fun_out.exp         |  2 +-
 .../gdb.ada/fixed_points_function.exp         |  2 +-
 gdb/testsuite/gdb.ada/float-bits.exp          |  9 +++----
 gdb/testsuite/gdb.ada/formatted_ref.exp       |  4 +--
 gdb/testsuite/gdb.ada/frame_args.exp          |  2 +-
 gdb/testsuite/gdb.ada/fullname_bp.exp         |  2 +-
 gdb/testsuite/gdb.ada/fun_addr.exp            |  2 +-
 gdb/testsuite/gdb.ada/fun_in_declare.exp      |  2 +-
 gdb/testsuite/gdb.ada/fun_overload_menu.exp   |  3 +--
 gdb/testsuite/gdb.ada/fun_renaming.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_char.exp        |  2 +-
 gdb/testsuite/gdb.ada/funcall_param.exp       |  2 +-
 gdb/testsuite/gdb.ada/funcall_ptr.exp         |  2 +-
 gdb/testsuite/gdb.ada/ghost.exp               |  2 +-
 gdb/testsuite/gdb.ada/homonym.exp             |  3 +--
 .../gdb.ada/info_addr_mixed_case.exp          |  2 +-
 gdb/testsuite/gdb.ada/info_auto_lang.exp      | 25 +++++++++----------
 gdb/testsuite/gdb.ada/info_exc.exp            |  4 +--
 gdb/testsuite/gdb.ada/inline-section-gc.exp   |  1 -
 gdb/testsuite/gdb.ada/int_deref.exp           |  2 +-
 gdb/testsuite/gdb.ada/interface.exp           |  2 +-
 gdb/testsuite/gdb.ada/iterated-assign.exp     |  2 +-
 gdb/testsuite/gdb.ada/iwide.exp               |  2 +-
 gdb/testsuite/gdb.ada/lang_switch.exp         |  2 +-
 gdb/testsuite/gdb.ada/length_cond.exp         |  2 +-
 gdb/testsuite/gdb.ada/maint_with_ada.exp      |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_assert.exp     |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    |  3 +--
 gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  2 +-
 gdb/testsuite/gdb.ada/mi_exc_info.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_interface.exp        |  2 +-
 gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  2 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp         |  2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp        |  2 +-
 gdb/testsuite/gdb.ada/mi_var_access.exp       |  2 +-
 gdb/testsuite/gdb.ada/minsyms.exp             |  2 +-
 gdb/testsuite/gdb.ada/nested.exp              |  2 +-
 gdb/testsuite/gdb.ada/non-ascii-latin-3.exp   |  2 +-
 gdb/testsuite/gdb.ada/null_array.exp          |  2 +-
 gdb/testsuite/gdb.ada/operator_bp.exp         |  4 +--
 gdb/testsuite/gdb.ada/optim_drec.exp          |  2 +-
 gdb/testsuite/gdb.ada/packed_array_assign.exp |  2 +-
 gdb/testsuite/gdb.ada/pp-rec-component.exp    |  2 +-
 gdb/testsuite/gdb.ada/print_chars.exp         |  3 +--
 gdb/testsuite/gdb.ada/print_pc.exp            |  2 +-
 gdb/testsuite/gdb.ada/ptr_typedef.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_array.exp         |  2 +-
 gdb/testsuite/gdb.ada/ptype_field.exp         |  6 ++---
 gdb/testsuite/gdb.ada/ptype_tagged_param.exp  |  2 +-
 gdb/testsuite/gdb.ada/py_range.exp            |  2 +-
 gdb/testsuite/gdb.ada/rdv_wait.exp            |  2 +-
 gdb/testsuite/gdb.ada/rec_comp.exp            |  2 +-
 gdb/testsuite/gdb.ada/rec_return.exp          |  2 +-
 gdb/testsuite/gdb.ada/ref_param.exp           |  4 +--
 gdb/testsuite/gdb.ada/ref_tick_size.exp       |  2 +-
 .../gdb.ada/rename_subscript_param.exp        |  2 +-
 gdb/testsuite/gdb.ada/repeat_dyn.exp          |  2 +-
 gdb/testsuite/gdb.ada/same_enum.exp           |  4 +--
 gdb/testsuite/gdb.ada/scoped_watch.exp        |  1 -
 gdb/testsuite/gdb.ada/set_wstr.exp            |  2 +-
 gdb/testsuite/gdb.ada/small_reg_param.exp     |  2 +-
 gdb/testsuite/gdb.ada/str_binop_equal.exp     |  2 +-
 gdb/testsuite/gdb.ada/str_chars.exp           |  2 +-
 gdb/testsuite/gdb.ada/str_ref_cmp.exp         |  2 +-
 gdb/testsuite/gdb.ada/str_uninit.exp          |  2 +-
 gdb/testsuite/gdb.ada/sub_variant.exp         |  2 +-
 gdb/testsuite/gdb.ada/sym_print_name.exp      |  2 +-
 gdb/testsuite/gdb.ada/taft_type.exp           |  2 +-
 gdb/testsuite/gdb.ada/tagged.exp              |  6 ++---
 gdb/testsuite/gdb.ada/task_bp.exp             |  2 +-
 gdb/testsuite/gdb.ada/task_switch_in_core.exp |  3 +--
 gdb/testsuite/gdb.ada/tasks.exp               |  2 +-
 gdb/testsuite/gdb.ada/tick_last_segv.exp      |  2 +-
 .../gdb.ada/tick_length_array_enum_idx.exp    |  2 +-
 gdb/testsuite/gdb.ada/type_coercion.exp       |  2 +-
 .../gdb.ada/uninitialized-variable-record.exp |  2 +-
 gdb/testsuite/gdb.ada/uninitialized_vars.exp  |  2 +-
 gdb/testsuite/gdb.ada/var_arr_attrs.exp       |  2 +-
 gdb/testsuite/gdb.ada/var_arr_typedef.exp     |  2 +-
 gdb/testsuite/gdb.ada/varsize_limit.exp       |  2 +-
 gdb/testsuite/gdb.ada/voidctx.exp             |  2 +-
 gdb/testsuite/gdb.ada/whatis_array_val.exp    |  2 +-
 gdb/testsuite/gdb.ada/widewide.exp            |  2 +-
 gdb/testsuite/gdb.ada/win_fu_syms.exp         |  2 +-
 125 files changed, 162 insertions(+), 173 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/access_tagged_param.exp b/gdb/testsuite/gdb.ada/access_tagged_param.exp
index 1e470f9e3c2..36297111386 100644
--- a/gdb/testsuite/gdb.ada/access_tagged_param.exp
+++ b/gdb/testsuite/gdb.ada/access_tagged_param.exp
@@ -22,7 +22,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/access_to_packed_array.exp b/gdb/testsuite/gdb.ada/access_to_packed_array.exp
index bff580bc7d0..7b8af2f50fb 100644
--- a/gdb/testsuite/gdb.ada/access_to_packed_array.exp
+++ b/gdb/testsuite/gdb.ada/access_to_packed_array.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/addr_arith.exp b/gdb/testsuite/gdb.ada/addr_arith.exp
index 9f025b227e8..ef70c3e02af 100644
--- a/gdb/testsuite/gdb.ada/addr_arith.exp
+++ b/gdb/testsuite/gdb.ada/addr_arith.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_na07_019
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/arr_arr.exp b/gdb/testsuite/gdb.ada/arr_arr.exp
index f586c348026..a23de7e97b6 100644
--- a/gdb/testsuite/gdb.ada/arr_arr.exp
+++ b/gdb/testsuite/gdb.ada/arr_arr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/array_bounds.exp b/gdb/testsuite/gdb.ada/array_bounds.exp
index f9b4fb48cc3..0c1ba2b8dd9 100644
--- a/gdb/testsuite/gdb.ada/array_bounds.exp
+++ b/gdb/testsuite/gdb.ada/array_bounds.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile bar
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/array_subscript_addr.exp b/gdb/testsuite/gdb.ada/array_subscript_addr.exp
index 836d2444e36..3f022b5c1d4 100644
--- a/gdb/testsuite/gdb.ada/array_subscript_addr.exp
+++ b/gdb/testsuite/gdb.ada/array_subscript_addr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/arraydim.exp b/gdb/testsuite/gdb.ada/arraydim.exp
index 7b84a7af9b7..12f18094d19 100644
--- a/gdb/testsuite/gdb.ada/arraydim.exp
+++ b/gdb/testsuite/gdb.ada/arraydim.exp
@@ -24,7 +24,7 @@ set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c
 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]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/assign_1.exp b/gdb/testsuite/gdb.ada/assign_1.exp
index e4742688955..cd3405d2e96 100644
--- a/gdb/testsuite/gdb.ada/assign_1.exp
+++ b/gdb/testsuite/gdb.ada/assign_1.exp
@@ -28,7 +28,6 @@ gdb_test "print \$xxx := 1" \
     "= 1" \
     "set convenience variable \$xxx to 1"
 
-
 gdb_test "print \$xxx := @ + 23 + @" \
     " = 25" \
     "update convenience using '@'"
diff --git a/gdb/testsuite/gdb.ada/assign_arr.exp b/gdb/testsuite/gdb.ada/assign_arr.exp
index 574ca1dba8a..bd69c603075 100644
--- a/gdb/testsuite/gdb.ada/assign_arr.exp
+++ b/gdb/testsuite/gdb.ada/assign_arr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile main_p324_051
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/atomic_enum.exp b/gdb/testsuite/gdb.ada/atomic_enum.exp
index 4d35f609da6..bfc669ecca0 100644
--- a/gdb/testsuite/gdb.ada/atomic_enum.exp
+++ b/gdb/testsuite/gdb.ada/atomic_enum.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
index 11a9bd60f5d..402e05da54c 100644
--- a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
+++ b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile "foo"
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
index ba55d904016..3bea4e62a2e 100644
--- a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
+++ b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
index 4dd4106649a..b3760d71851 100644
--- a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
+++ b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp
@@ -40,7 +40,7 @@ set options [list debug \
 		 additional_flags=${cobject} \
 		 additional_flags=${cobject2} \
 		 additional_flags=-margs]
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
index 3df69574969..a688c28a16e 100644
--- a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
+++ b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_inlined_func.exp b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
index 145ce0a0213..fa4745a3103 100644
--- a/gdb/testsuite/gdb.ada/bp_inlined_func.exp
+++ b/gdb/testsuite/gdb.ada/bp_inlined_func.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_on_var.exp b/gdb/testsuite/gdb.ada/bp_on_var.exp
index 6d2b686c62f..ec92f334347 100644
--- a/gdb/testsuite/gdb.ada/bp_on_var.exp
+++ b/gdb/testsuite/gdb.ada/bp_on_var.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -35,7 +35,6 @@ 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\\."
 
-
 # Test inserting breakpoint on pck.my_hidden_variable.
 
 clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.ada/bp_range_type.exp b/gdb/testsuite/gdb.ada/bp_range_type.exp
index 9fa1afdbf8b..d162f71bc5c 100644
--- a/gdb/testsuite/gdb.ada/bp_range_type.exp
+++ b/gdb/testsuite/gdb.ada/bp_range_type.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/bp_reset.exp b/gdb/testsuite/gdb.ada/bp_reset.exp
index 2f6854b293c..ea1754e92f2 100644
--- a/gdb/testsuite/gdb.ada/bp_reset.exp
+++ b/gdb/testsuite/gdb.ada/bp_reset.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/call_pn.exp b/gdb/testsuite/gdb.ada/call_pn.exp
index ff234b9aa99..ed2ea3fcdb4 100644
--- a/gdb/testsuite/gdb.ada/call_pn.exp
+++ b/gdb/testsuite/gdb.ada/call_pn.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp
index c64db6f1fcf..10817a43a0d 100644
--- a/gdb/testsuite/gdb.ada/catch_assert_if.exp
+++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index dd482561a9c..6e6525cbcc5 100644
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/char_enum.exp b/gdb/testsuite/gdb.ada/char_enum.exp
index 78e2545cec6..251b817ce34 100644
--- a/gdb/testsuite/gdb.ada/char_enum.exp
+++ b/gdb/testsuite/gdb.ada/char_enum.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/char_enum_overload.exp b/gdb/testsuite/gdb.ada/char_enum_overload.exp
index f2c4ec40ef0..15f42fac84d 100644
--- a/gdb/testsuite/gdb.ada/char_enum_overload.exp
+++ b/gdb/testsuite/gdb.ada/char_enum_overload.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/char_enum_unicode.exp b/gdb/testsuite/gdb.ada/char_enum_unicode.exp
index 6bba61c1f78..1f7701ad8ba 100644
--- a/gdb/testsuite/gdb.ada/char_enum_unicode.exp
+++ b/gdb/testsuite/gdb.ada/char_enum_unicode.exp
@@ -20,7 +20,7 @@ require allow_ada_tests
 standard_ada_testfile foo
 
 set flags [list debug additional_flags=-gnatW8]
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/char_param.exp b/gdb/testsuite/gdb.ada/char_param.exp
index 5ab33d82435..21de88e98d8 100644
--- a/gdb/testsuite/gdb.ada/char_param.exp
+++ b/gdb/testsuite/gdb.ada/char_param.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -34,7 +34,7 @@ runto "foo.adb:$bp_location"
 # the function call.
 
 gdb_test "print procedure_result" \
-    "= 32 ' '"  \
+    "= 32 ' '" \
     "print procedure_result before calling same"
 
 gdb_test "call same (first)" \
@@ -42,7 +42,7 @@ gdb_test "call same (first)" \
     "call same"
 
 gdb_test "print procedure_result" \
-    "= 97 'a'"  \
+    "= 97 'a'" \
     "print procedure_result after calling same"
 
 gdb_test "call next (first)" \
@@ -50,5 +50,5 @@ gdb_test "call next (first)" \
     "call next"
 
 gdb_test "print procedure_result" \
-    "= 98 'b'"  \
+    "= 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 8b88591916f..9c6ff924c15 100644
--- a/gdb/testsuite/gdb.ada/complete.exp
+++ b/gdb/testsuite/gdb.ada/complete.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -146,23 +146,23 @@ test_gdb_complete "pck.inner." \
 # Two matches, from the global scope:
 test_gdb_complete "local_ident" \
     [multi_line "p local_identical_one" \
-	 "p local_identical_two" ]
+	 "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" ]
+	 "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" ]
+	 "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" ]
+	 "p external_identical_two"]
 
 # Complete on the name of package.
 test_gdb_complete "pck" \
@@ -178,7 +178,7 @@ test_gdb_complete "pck" \
 	 "p pck.local_identical_one" \
 	 "p pck.local_identical_two" \
 	 "p pck.my_global_variable" \
-	 "p pck.proc" ]
+	 "p pck.proc"]
 
 # Complete on the name of a package followed by a dot:
 test_gdb_complete "pck." \
@@ -194,7 +194,7 @@ test_gdb_complete "pck." \
 	 "p pck.local_identical_one" \
 	 "p pck.local_identical_two" \
 	 "p pck.my_global_variable" \
-	 "p pck.proc" ]
+	 "p pck.proc"]
 
 # Complete a mangled symbol name, but using the '<...>' notation.
 test_gdb_complete "<pck__my" \
@@ -225,7 +225,7 @@ if { [readline_is_used] } {
 # completion, though.
 test_gdb_complete "ambig" \
     [multi_line "p ambiguous_func" \
-	 "p ambiguous_proc" ]
+	 "p ambiguous_proc"]
 test_gdb_complete "ambiguous_f" \
     "p ambiguous_func"
 test_gdb_complete "ambiguous_func" \
diff --git a/gdb/testsuite/gdb.ada/cond_lang.exp b/gdb/testsuite/gdb.ada/cond_lang.exp
index 017ab2eb784..dc3e2037b0a 100644
--- a/gdb/testsuite/gdb.ada/cond_lang.exp
+++ b/gdb/testsuite/gdb.ada/cond_lang.exp
@@ -24,7 +24,7 @@ set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c
 set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/convvar_comp.exp b/gdb/testsuite/gdb.ada/convvar_comp.exp
index b6652e837bf..3fbae443db7 100644
--- a/gdb/testsuite/gdb.ada/convvar_comp.exp
+++ b/gdb/testsuite/gdb.ada/convvar_comp.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile pb16_063
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/delta-assign.exp b/gdb/testsuite/gdb.ada/delta-assign.exp
index 996f7d70125..c22d9729823 100644
--- a/gdb/testsuite/gdb.ada/delta-assign.exp
+++ b/gdb/testsuite/gdb.ada/delta-assign.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile main
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/disc_arr_bound.exp b/gdb/testsuite/gdb.ada/disc_arr_bound.exp
index e4fb834fa50..6631d4e54cb 100644
--- a/gdb/testsuite/gdb.ada/disc_arr_bound.exp
+++ b/gdb/testsuite/gdb.ada/disc_arr_bound.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_n612_026
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/dot_all.exp b/gdb/testsuite/gdb.ada/dot_all.exp
index 58d1ae96afb..5b9ab9fe789 100644
--- a/gdb/testsuite/gdb.ada/dot_all.exp
+++ b/gdb/testsuite/gdb.ada/dot_all.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/dyn_arrayidx.exp b/gdb/testsuite/gdb.ada/dyn_arrayidx.exp
index f6f1dfdda10..be853bcd66c 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 e53ed3182d9..99331a6c64a 100644
--- a/gdb/testsuite/gdb.ada/dyn_loc.exp
+++ b/gdb/testsuite/gdb.ada/dyn_loc.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/dyn_stride.exp b/gdb/testsuite/gdb.ada/dyn_stride.exp
index 3febb39a627..2ea40c27f5c 100644
--- a/gdb/testsuite/gdb.ada/dyn_stride.exp
+++ b/gdb/testsuite/gdb.ada/dyn_stride.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/dynamic-iface.exp b/gdb/testsuite/gdb.ada/dynamic-iface.exp
index d521a1ba1ea..16795aef9b0 100644
--- a/gdb/testsuite/gdb.ada/dynamic-iface.exp
+++ b/gdb/testsuite/gdb.ada/dynamic-iface.exp
@@ -21,7 +21,7 @@ require gnat_runtime_has_debug_info
 
 standard_ada_testfile main
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug additional_flags=-gnat05}] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug additional_flags=-gnat05}] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/enums_overload.exp b/gdb/testsuite/gdb.ada/enums_overload.exp
index 80a57fbf13f..7a9332efaf8 100644
--- a/gdb/testsuite/gdb.ada/enums_overload.exp
+++ b/gdb/testsuite/gdb.ada/enums_overload.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile enums_overload_main
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp
index 763c98ef2b8..dc46244f76b 100644
--- a/gdb/testsuite/gdb.ada/excep_handle.exp
+++ b/gdb/testsuite/gdb.ada/excep_handle.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/expr_delims.exp b/gdb/testsuite/gdb.ada/expr_delims.exp
index 642a6891ef1..cb16d88919f 100644
--- a/gdb/testsuite/gdb.ada/expr_delims.exp
+++ b/gdb/testsuite/gdb.ada/expr_delims.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -30,7 +30,7 @@ set ws "\[ \t\r\n\]+"
 # Start the program in order to have some tasks running...
 set bp_location [gdb_get_line_number "STOP_HERE" ${testdir}/foo.adb]
 gdb_test "break foo.adb:$bp_location" \
-    "Breakpoint $decimal.*" \
+    "Breakpoint $decimal.*"
 
 gdb_run_cmd
 gdb_test "" "Breakpoint $decimal, foo \\(\\).*" \
diff --git a/gdb/testsuite/gdb.ada/expr_with_funcall.exp b/gdb/testsuite/gdb.ada/expr_with_funcall.exp
index 3402a5c7dc3..ec80cff8e43 100644
--- a/gdb/testsuite/gdb.ada/expr_with_funcall.exp
+++ b/gdb/testsuite/gdb.ada/expr_with_funcall.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile expr_r821_013
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -28,27 +28,27 @@ clean_restart ${testfile}
 set bp_location [gdb_get_line_number "STOP" ${testdir}/expr_r821_013.adb]
 runto "expr_r821_013.adb:$bp_location"
 
-gdb_test "print something()"     " = 124"
+gdb_test "print something()" " = 124"
 gdb_test "print something() + 1" " = 125"
 gdb_test "print something() - 2" " = 122"
 gdb_test "print something() * 3" " = 372"
 gdb_test "print something() / 4" " = 31"
 
-gdb_test "print 1 + something()"   " = 125"
+gdb_test "print 1 + something()" " = 125"
 gdb_test "print 246 - something()" " = 122"
-gdb_test "print 3 * something()"   " = 372"
+gdb_test "print 3 * something()" " = 372"
 gdb_test "print 496 / something()" " = 4"
 
 # Same as above, but without using the parentheses in the call to
 # function "Something".
 
-gdb_test "print something"     " = 124"
+gdb_test "print something" " = 124"
 gdb_test "print something + 1" " = 125"
 gdb_test "print something - 2" " = 122"
 gdb_test "print something * 3" " = 372"
 gdb_test "print something / 4" " = 31"
 
-gdb_test "print 1 + something"   " = 125"
+gdb_test "print 1 + something" " = 125"
 gdb_test "print 246 - something" " = 122"
-gdb_test "print 3 * something"   " = 372"
+gdb_test "print 3 * something" " = 372"
 gdb_test "print 496 / something" " = 4"
diff --git a/gdb/testsuite/gdb.ada/exprs.exp b/gdb/testsuite/gdb.ada/exprs.exp
index aef904676e2..defb2033fd4 100644
--- a/gdb/testsuite/gdb.ada/exprs.exp
+++ b/gdb/testsuite/gdb.ada/exprs.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fin_fun_out.exp b/gdb/testsuite/gdb.ada/fin_fun_out.exp
index d648295dfb0..bdc0356d00d 100644
--- a/gdb/testsuite/gdb.ada/fin_fun_out.exp
+++ b/gdb/testsuite/gdb.ada/fin_fun_out.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_o525_013
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fixed_points_function.exp b/gdb/testsuite/gdb.ada/fixed_points_function.exp
index abe4e1f8d6d..a7e30eb7b11 100644
--- a/gdb/testsuite/gdb.ada/fixed_points_function.exp
+++ b/gdb/testsuite/gdb.ada/fixed_points_function.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile fixed_points_function
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/float-bits.exp b/gdb/testsuite/gdb.ada/float-bits.exp
index 2631083eda5..2c73fd4d703 100644
--- a/gdb/testsuite/gdb.ada/float-bits.exp
+++ b/gdb/testsuite/gdb.ada/float-bits.exp
@@ -28,7 +28,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
 # Given a floating point EXPRESSION, return the size of the result.
 
 proc float_size { expression } {
-
     set size 0
     gdb_test_multiple "ptype ${expression}" "" {
 	-re -wrap "<16-byte float>" {
@@ -64,10 +63,10 @@ gdb_test "print val_double" " = -2.0e-19" \
     "print val_double after assignment"
 
 # Fetch the size of a compiler-generated long double.
-set compiler_long_double_size [float_size "long_long_float" ]
+set compiler_long_double_size [float_size "long_long_float"]
 
 # Fetch the size of an internal long double type in GDB.
-set gdb_long_double_size [float_size "16llf#0#" ]
+set gdb_long_double_size [float_size "16llf#0#"]
 
 # Different architectures use different long double formats.  For
 # example, IEEE quad versus i387 long doubles.  Account for that in the
@@ -76,7 +75,7 @@ set gdb_long_double_size [float_size "16llf#0#" ]
 # Get the used long double format.
 set long_double_format ""
 set cmd "maint print architecture"
-gdb_test_multiple $cmd  "" {
+gdb_test_multiple $cmd "" {
     -re "^[string_to_regexp $cmd](?=\r\n)" {
 	exp_continue
     }
@@ -114,7 +113,7 @@ switch -glob $long_double_format {
     }
 }
 
-if { [istarget x86_64-*-* ] || [istarget i?86-*-*] } {
+if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
     # i387 long double have invalid values
     set has_invalid_long_double 1
     if { $compiler_long_double_size == 16 } {
diff --git a/gdb/testsuite/gdb.ada/formatted_ref.exp b/gdb/testsuite/gdb.ada/formatted_ref.exp
index 3180c1d2796..157684e6293 100644
--- a/gdb/testsuite/gdb.ada/formatted_ref.exp
+++ b/gdb/testsuite/gdb.ada/formatted_ref.exp
@@ -30,7 +30,7 @@ require allow_ada_tests
 
 standard_ada_testfile formatted_ref
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     untested formatted-ref.exp
     return
 }
@@ -121,7 +121,7 @@ gdb_test_multiple "" "Runto to $bp_location" {
     }
 }
 
-set s1_address  [get_address "s1"]
+set s1_address [get_address "s1"]
 
 test_p_x "s" "(x => 0xd, y => 0x13)" $s1_address
 
diff --git a/gdb/testsuite/gdb.ada/frame_args.exp b/gdb/testsuite/gdb.ada/frame_args.exp
index 12da12f749c..fd2b9f50208 100644
--- a/gdb/testsuite/gdb.ada/frame_args.exp
+++ b/gdb/testsuite/gdb.ada/frame_args.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fullname_bp.exp b/gdb/testsuite/gdb.ada/fullname_bp.exp
index 96d2d3bcf93..0bf972df95c 100644
--- a/gdb/testsuite/gdb.ada/fullname_bp.exp
+++ b/gdb/testsuite/gdb.ada/fullname_bp.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fun_addr.exp b/gdb/testsuite/gdb.ada/fun_addr.exp
index e7c7790c5c0..ed20d19594d 100644
--- a/gdb/testsuite/gdb.ada/fun_addr.exp
+++ b/gdb/testsuite/gdb.ada/fun_addr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fun_in_declare.exp b/gdb/testsuite/gdb.ada/fun_in_declare.exp
index 916e79776f6..d9a3e9ae5cc 100644
--- a/gdb/testsuite/gdb.ada/fun_in_declare.exp
+++ b/gdb/testsuite/gdb.ada/fun_in_declare.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/fun_overload_menu.exp b/gdb/testsuite/gdb.ada/fun_overload_menu.exp
index 0f8253b2118..9bf8c82b232 100644
--- a/gdb/testsuite/gdb.ada/fun_overload_menu.exp
+++ b/gdb/testsuite/gdb.ada/fun_overload_menu.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } {
+if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != ""} {
     return
 }
 
@@ -59,7 +59,6 @@ proc test_menu {expr function first second selection output} {
     gdb_test "$selection" "$output"
 }
 
-
 # Check that function signatures in overload menus are displayed as expected.
 
 # 1. Test with overloaded functions
diff --git a/gdb/testsuite/gdb.ada/fun_renaming.exp b/gdb/testsuite/gdb.ada/fun_renaming.exp
index 4e853dba24c..ea44e03beb9 100644
--- a/gdb/testsuite/gdb.ada/fun_renaming.exp
+++ b/gdb/testsuite/gdb.ada/fun_renaming.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile fun_renaming
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/funcall_char.exp b/gdb/testsuite/gdb.ada/funcall_char.exp
index 1016bc3fca8..83b825ad999 100644
--- a/gdb/testsuite/gdb.ada/funcall_char.exp
+++ b/gdb/testsuite/gdb.ada/funcall_char.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/funcall_param.exp b/gdb/testsuite/gdb.ada/funcall_param.exp
index 65c99a05390..32ddaefcc37 100644
--- a/gdb/testsuite/gdb.ada/funcall_param.exp
+++ b/gdb/testsuite/gdb.ada/funcall_param.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/funcall_ptr.exp b/gdb/testsuite/gdb.ada/funcall_ptr.exp
index f9e377d659a..ad6600e9bda 100644
--- a/gdb/testsuite/gdb.ada/funcall_ptr.exp
+++ b/gdb/testsuite/gdb.ada/funcall_ptr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } {
+if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/ghost.exp b/gdb/testsuite/gdb.ada/ghost.exp
index 9da7a9ff2a1..639f2c744b0 100644
--- a/gdb/testsuite/gdb.ada/ghost.exp
+++ b/gdb/testsuite/gdb.ada/ghost.exp
@@ -20,7 +20,7 @@ require allow_ada_tests
 standard_ada_testfile main
 
 set flags [list debug additional_flags=-gnata]
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/homonym.exp b/gdb/testsuite/gdb.ada/homonym.exp
index abad4b96236..249ffa802fc 100644
--- a/gdb/testsuite/gdb.ada/homonym.exp
+++ b/gdb/testsuite/gdb.ada/homonym.exp
@@ -19,13 +19,12 @@ require allow_ada_tests
 
 standard_ada_testfile homonym_main
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
 clean_restart ${testfile}
 
-
 # Do these tests before running, so we are operating in a known
 # environment.
 
diff --git a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
index cff5d378631..67e866cd523 100644
--- a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
+++ b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp
index e717802a8d2..8f833159aff 100644
--- a/gdb/testsuite/gdb.ada/info_auto_lang.exp
+++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp
@@ -37,7 +37,7 @@ if { [gdb_compile "${csrcfile}" "${cobject}" object [list debug]] != "" } {
     untested "failed to compile"
     return
 }
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     untested "failed to compile"
     return
 }
@@ -49,8 +49,8 @@ if {![runto "some_c.c:$bp_location"]} {
     return
 }
 
-set func_in_c(c_syntax)      "${decimal}:	void proc_in_c\\\(void\\\);"
-set func_in_c(ada_syntax)    "${decimal}:	procedure proc_in_c;"
+set func_in_c(c_syntax) "${decimal}:	void proc_in_c\\\(void\\\);"
+set func_in_c(ada_syntax) "${decimal}:	procedure proc_in_c;"
 set func_in_ada(c_syntax) \
     [string cat \
 	 "${decimal}:	void proc_in_ada\\\(void\\\);\r\n" \
@@ -64,20 +64,19 @@ 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" ]
+			       "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"
+set type_in_ada(ada_syntax) "${decimal}:	global_pack.some_type_in_ada"
 
-set var_in_c(c_syntax)     "${decimal}:	some_type_in_c some_struct_in_c;"
-set var_in_c(ada_syntax)   "${decimal}:	some_struct_in_c: some_type_in_c;"
-set var_in_ada(c_syntax)   "${decimal}:	struct global_pack__some_type_in_ada global_pack.some_struct_in_ada;"
+set var_in_c(c_syntax) "${decimal}:	some_type_in_c some_struct_in_c;"
+set var_in_c(ada_syntax) "${decimal}:	some_struct_in_c: some_type_in_c;"
+set var_in_ada(c_syntax) "${decimal}:	struct global_pack__some_type_in_ada global_pack.some_struct_in_ada;"
 set var_in_ada(ada_syntax) "${decimal}:	global_pack.some_struct_in_ada: global_pack.some_type_in_ada;"
 
-set rbreak_func_in_c(c_syntax)      "void proc_in_c\\\(void\\\);"
-set rbreak_func_in_c(ada_syntax)    "procedure proc_in_c;"
-set rbreak_func_in_ada(c_syntax)    "void proc_in_ada\\\(void\\\);"
-set rbreak_func_in_ada(ada_syntax)  "procedure proc_in_ada;"
-
+set rbreak_func_in_c(c_syntax) "void proc_in_c\\\(void\\\);"
+set rbreak_func_in_c(ada_syntax) "procedure proc_in_c;"
+set rbreak_func_in_ada(c_syntax) "void proc_in_ada\\\(void\\\);"
+set rbreak_func_in_ada(ada_syntax) "procedure proc_in_ada;"
 
 foreach_with_prefix language_choice { "auto" "ada" "c" } {
 
diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
index dd2397cef03..3291136c7ac 100644
--- a/gdb/testsuite/gdb.ada/info_exc.exp
+++ b/gdb/testsuite/gdb.ada/info_exc.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -35,7 +35,7 @@ gdb_test "info exceptions" \
 	 "program_error: $hex" \
 	 "storage_error: $hex" \
 	 "tasking_error: $hex" \
-	 ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ]
+	 ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*"]
 
 gdb_test "info exceptions task" \
     [multi_line "All Ada exceptions matching regular expression \"task\":" \
diff --git a/gdb/testsuite/gdb.ada/inline-section-gc.exp b/gdb/testsuite/gdb.ada/inline-section-gc.exp
index 0a40d6a0d41..43edf432ad9 100644
--- a/gdb/testsuite/gdb.ada/inline-section-gc.exp
+++ b/gdb/testsuite/gdb.ada/inline-section-gc.exp
@@ -40,7 +40,6 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != ""} {
 
 clean_restart ${testfile}
 
-
 # Depending on the version of gnat, the location of the set breakpoint may
 # be reported as being at the requested location in file callee.adb or in
 # file caller.adb where the callee function was inlined.  Either way, only
diff --git a/gdb/testsuite/gdb.ada/int_deref.exp b/gdb/testsuite/gdb.ada/int_deref.exp
index 47489ca1c87..0f99935f7a4 100644
--- a/gdb/testsuite/gdb.ada/int_deref.exp
+++ b/gdb/testsuite/gdb.ada/int_deref.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp
index 42e9184f9fe..e6d50bc2b81 100644
--- a/gdb/testsuite/gdb.ada/interface.exp
+++ b/gdb/testsuite/gdb.ada/interface.exp
@@ -21,7 +21,7 @@ require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/iterated-assign.exp b/gdb/testsuite/gdb.ada/iterated-assign.exp
index 81ec898e200..7b26c95e01a 100644
--- a/gdb/testsuite/gdb.ada/iterated-assign.exp
+++ b/gdb/testsuite/gdb.ada/iterated-assign.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile main
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/iwide.exp b/gdb/testsuite/gdb.ada/iwide.exp
index da6db33fa0b..47095da82b6 100644
--- a/gdb/testsuite/gdb.ada/iwide.exp
+++ b/gdb/testsuite/gdb.ada/iwide.exp
@@ -21,7 +21,7 @@ require gnat_runtime_has_debug_info
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/lang_switch.exp b/gdb/testsuite/gdb.ada/lang_switch.exp
index 522447713ab..33d90d4b58d 100644
--- a/gdb/testsuite/gdb.ada/lang_switch.exp
+++ b/gdb/testsuite/gdb.ada/lang_switch.exp
@@ -23,7 +23,7 @@ set csrcfile ${srcdir}/${subdir}/${testdir}/${cfile}.c
 set cobject [standard_output_file ${cfile}.o]
 
 gdb_compile "${csrcfile}" "${cobject}" object [list debug]
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/length_cond.exp b/gdb/testsuite/gdb.ada/length_cond.exp
index 5cf4fb8eabd..3df420c45be 100644
--- a/gdb/testsuite/gdb.ada/length_cond.exp
+++ b/gdb/testsuite/gdb.ada/length_cond.exp
@@ -22,7 +22,7 @@ require allow_ada_tests
 
 standard_ada_testfile length_cond
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/maint_with_ada.exp b/gdb/testsuite/gdb.ada/maint_with_ada.exp
index 9f8f682ceaa..549d6719580 100644
--- a/gdb/testsuite/gdb.ada/maint_with_ada.exp
+++ b/gdb/testsuite/gdb.ada/maint_with_ada.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile var_arr_typedef
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
index b128513226d..9ce8c9b765c 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_assert.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index 3a88881a321..e893f2725fc 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
index bb1113c3b8e..ea395e3e654 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp
@@ -19,7 +19,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 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
@@ -45,7 +45,6 @@ mi_gdb_test "-catch-handlers" \
 # Continue to exception handler.
 
 proc continue_to_exception_handler { test line } {
-
     global decimal
 
     mi_send_resuming_command "exec-continue" "$test"
diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
index e10a7998d4c..114dac7e154 100644
--- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
+++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp
index 2874e8d7dde..e67ef9ce0c2 100644
--- a/gdb/testsuite/gdb.ada/mi_exc_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp
index 8d377965edf..abdec93a9af 100644
--- a/gdb/testsuite/gdb.ada/mi_interface.exp
+++ b/gdb/testsuite/gdb.ada/mi_interface.exp
@@ -21,7 +21,7 @@ require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat12 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat12]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
index 228123c9773..a0b07038608 100644
--- a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
+++ b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_rb20_056
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp
index 52eef8484ac..09fb36ba39f 100644
--- a/gdb/testsuite/gdb.ada/mi_task_arg.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile task_switch
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp
index b53c01b49a6..f0a0241a928 100644
--- a/gdb/testsuite/gdb.ada/mi_task_info.exp
+++ b/gdb/testsuite/gdb.ada/mi_task_info.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile task_switch
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/mi_var_access.exp b/gdb/testsuite/gdb.ada/mi_var_access.exp
index da49e29769d..3a603d22438 100644
--- a/gdb/testsuite/gdb.ada/mi_var_access.exp
+++ b/gdb/testsuite/gdb.ada/mi_var_access.exp
@@ -22,7 +22,7 @@ standard_ada_testfile mi_access
 load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/minsyms.exp b/gdb/testsuite/gdb.ada/minsyms.exp
index 1eb5fa6c4eb..9dbbfdc1fd3 100644
--- a/gdb/testsuite/gdb.ada/minsyms.exp
+++ b/gdb/testsuite/gdb.ada/minsyms.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_qb07_057
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable ""] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable ""] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/nested.exp b/gdb/testsuite/gdb.ada/nested.exp
index e09708ff45d..8d8aa217874 100644
--- a/gdb/testsuite/gdb.ada/nested.exp
+++ b/gdb/testsuite/gdb.ada/nested.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile hello
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/non-ascii-latin-3.exp b/gdb/testsuite/gdb.ada/non-ascii-latin-3.exp
index fd4cd5f064c..8dd422cfb7b 100644
--- a/gdb/testsuite/gdb.ada/non-ascii-latin-3.exp
+++ b/gdb/testsuite/gdb.ada/non-ascii-latin-3.exp
@@ -67,4 +67,4 @@ gdb_test break_2 "Breakpoint $decimal .*" \
     "gdb_breakpoint: set breakpoint at func_ż"
 
 gdb_test print_3 "warning: charset conversion failure.*" \
-     "print var_𝕯"
+    "print var_𝕯"
diff --git a/gdb/testsuite/gdb.ada/null_array.exp b/gdb/testsuite/gdb.ada/null_array.exp
index 871066f5820..1a3dd916207 100644
--- a/gdb/testsuite/gdb.ada/null_array.exp
+++ b/gdb/testsuite/gdb.ada/null_array.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/operator_bp.exp b/gdb/testsuite/gdb.ada/operator_bp.exp
index 562bfd5ea8f..6c93d00f5af 100644
--- a/gdb/testsuite/gdb.ada/operator_bp.exp
+++ b/gdb/testsuite/gdb.ada/operator_bp.exp
@@ -56,7 +56,7 @@ 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\" .*"\
+	"Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*" \
 	"continue to \"$op\""
 }
 
@@ -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\" .*"\
+	"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 2f5862e385c..cd006be3980 100644
--- a/gdb/testsuite/gdb.ada/optim_drec.exp
+++ b/gdb/testsuite/gdb.ada/optim_drec.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/packed_array_assign.exp b/gdb/testsuite/gdb.ada/packed_array_assign.exp
index 491af6320be..5865a465273 100644
--- a/gdb/testsuite/gdb.ada/packed_array_assign.exp
+++ b/gdb/testsuite/gdb.ada/packed_array_assign.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile tester
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/pp-rec-component.exp b/gdb/testsuite/gdb.ada/pp-rec-component.exp
index 39eec3098b5..85128343d68 100644
--- a/gdb/testsuite/gdb.ada/pp-rec-component.exp
+++ b/gdb/testsuite/gdb.ada/pp-rec-component.exp
@@ -19,7 +19,7 @@ require allow_ada_tests allow_python_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/print_chars.exp b/gdb/testsuite/gdb.ada/print_chars.exp
index cefc6bcbc87..515ff97d96a 100644
--- a/gdb/testsuite/gdb.ada/print_chars.exp
+++ b/gdb/testsuite/gdb.ada/print_chars.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
@@ -28,7 +28,6 @@ clean_restart ${testfile}
 set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
 
-
 gdb_test "print C" \
     "= 97 'a'"
 
diff --git a/gdb/testsuite/gdb.ada/print_pc.exp b/gdb/testsuite/gdb.ada/print_pc.exp
index ceea2b283cd..93ce975f451 100644
--- a/gdb/testsuite/gdb.ada/print_pc.exp
+++ b/gdb/testsuite/gdb.ada/print_pc.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile dummy start
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/ptr_typedef.exp b/gdb/testsuite/gdb.ada/ptr_typedef.exp
index ede4003f31d..e1ad4a3efac 100644
--- a/gdb/testsuite/gdb.ada/ptr_typedef.exp
+++ b/gdb/testsuite/gdb.ada/ptr_typedef.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/ptype_array.exp b/gdb/testsuite/gdb.ada/ptype_array.exp
index ad38794cceb..1a9c58f841a 100644
--- a/gdb/testsuite/gdb.ada/ptype_array.exp
+++ b/gdb/testsuite/gdb.ada/ptype_array.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/ptype_field.exp b/gdb/testsuite/gdb.ada/ptype_field.exp
index e808b8492bb..c7dac702841 100644
--- a/gdb/testsuite/gdb.ada/ptype_field.exp
+++ b/gdb/testsuite/gdb.ada/ptype_field.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05]] != ""} {
     return
 }
 
@@ -32,13 +32,13 @@ gdb_test "ptype circle" \
     [multi_line "type = record" \
 	 "    pos: pck\\.position;" \
 	 "    radius: integer;" \
-	 "end record" ]
+	 "end record"]
 
 gdb_test "ptype circle.pos" \
     [multi_line "type = record" \
 	 "    x: integer;" \
 	 "    y: integer;" \
-	 "end record" ]
+	 "end record"]
 
 gdb_test "ptype circle.pos.x" \
     "type = <${::decimal}-byte integer>"
diff --git a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
index 347187bef22..2e80a2b8aaa 100644
--- a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
+++ b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/py_range.exp b/gdb/testsuite/gdb.ada/py_range.exp
index 92864e8cd6e..faebcc83f43 100644
--- a/gdb/testsuite/gdb.ada/py_range.exp
+++ b/gdb/testsuite/gdb.ada/py_range.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]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/rdv_wait.exp b/gdb/testsuite/gdb.ada/rdv_wait.exp
index 3bfd503e9e1..6fa791cda5d 100644
--- a/gdb/testsuite/gdb.ada/rdv_wait.exp
+++ b/gdb/testsuite/gdb.ada/rdv_wait.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/rec_comp.exp b/gdb/testsuite/gdb.ada/rec_comp.exp
index 5d925695965..2e905340678 100644
--- a/gdb/testsuite/gdb.ada/rec_comp.exp
+++ b/gdb/testsuite/gdb.ada/rec_comp.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile bar_o203_012
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/rec_return.exp b/gdb/testsuite/gdb.ada/rec_return.exp
index 5ee1be34f46..c68793e0e50 100644
--- a/gdb/testsuite/gdb.ada/rec_return.exp
+++ b/gdb/testsuite/gdb.ada/rec_return.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/ref_param.exp b/gdb/testsuite/gdb.ada/ref_param.exp
index f207a0b127c..bb505a050c6 100644
--- a/gdb/testsuite/gdb.ada/ref_param.exp
+++ b/gdb/testsuite/gdb.ada/ref_param.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -33,5 +33,5 @@ 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}\\).*"  \
+    "#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 6ab00772b25..8e977909f8f 100644
--- a/gdb/testsuite/gdb.ada/ref_tick_size.exp
+++ b/gdb/testsuite/gdb.ada/ref_tick_size.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
index 8c077b569eb..469e9f5c5e5 100644
--- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp
+++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
@@ -21,7 +21,7 @@ require {gnat_version_compare >= 8}
 
 standard_ada_testfile pb30_012
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/repeat_dyn.exp b/gdb/testsuite/gdb.ada/repeat_dyn.exp
index f0ea4d5298a..6365da906f7 100644
--- a/gdb/testsuite/gdb.ada/repeat_dyn.exp
+++ b/gdb/testsuite/gdb.ada/repeat_dyn.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_oc22_002
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/same_enum.exp b/gdb/testsuite/gdb.ada/same_enum.exp
index c76f9610c02..ba4abf99436 100644
--- a/gdb/testsuite/gdb.ada/same_enum.exp
+++ b/gdb/testsuite/gdb.ada/same_enum.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile a
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -34,4 +34,4 @@ gdb_test "print red" "= red"
 
 # Check that both types are in fact present.
 gdb_test "ptype Color " "^type = .*"
-gdb_test "ptype RGB_Color"  "^type = .*"
+gdb_test "ptype RGB_Color" "^type = .*"
diff --git a/gdb/testsuite/gdb.ada/scoped_watch.exp b/gdb/testsuite/gdb.ada/scoped_watch.exp
index 67737ae5aee..87278b06662 100644
--- a/gdb/testsuite/gdb.ada/scoped_watch.exp
+++ b/gdb/testsuite/gdb.ada/scoped_watch.exp
@@ -77,7 +77,6 @@ gdb_test "next" \
 
 # And finally, one more continue.
 
-
 gdb_test "cont" \
     "Breakpoint ${::decimal}.*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 a07455e7719..a27f3e7324a 100644
--- a/gdb/testsuite/gdb.ada/set_wstr.exp
+++ b/gdb/testsuite/gdb.ada/set_wstr.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile a
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/small_reg_param.exp b/gdb/testsuite/gdb.ada/small_reg_param.exp
index f94f94a523f..6f7d8ac88ca 100644
--- a/gdb/testsuite/gdb.ada/small_reg_param.exp
+++ b/gdb/testsuite/gdb.ada/small_reg_param.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-O1]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-O1]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/str_binop_equal.exp b/gdb/testsuite/gdb.ada/str_binop_equal.exp
index 0d49ee6d2e4..be340b3c1a7 100644
--- a/gdb/testsuite/gdb.ada/str_binop_equal.exp
+++ b/gdb/testsuite/gdb.ada/str_binop_equal.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_p211_061
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/str_chars.exp b/gdb/testsuite/gdb.ada/str_chars.exp
index 86cabe15ecc..ff8a7c017e5 100644
--- a/gdb/testsuite/gdb.ada/str_chars.exp
+++ b/gdb/testsuite/gdb.ada/str_chars.exp
@@ -21,7 +21,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/str_ref_cmp.exp b/gdb/testsuite/gdb.ada/str_ref_cmp.exp
index 31afe414e0e..3bf13ebf784 100644
--- a/gdb/testsuite/gdb.ada/str_ref_cmp.exp
+++ b/gdb/testsuite/gdb.ada/str_ref_cmp.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/str_uninit.exp b/gdb/testsuite/gdb.ada/str_uninit.exp
index 8c85f96fc05..f5d5f31601c 100644
--- a/gdb/testsuite/gdb.ada/str_uninit.exp
+++ b/gdb/testsuite/gdb.ada/str_uninit.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile parse
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/sub_variant.exp b/gdb/testsuite/gdb.ada/sub_variant.exp
index 0e8a9aa976c..679c90c1632 100644
--- a/gdb/testsuite/gdb.ada/sub_variant.exp
+++ b/gdb/testsuite/gdb.ada/sub_variant.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile subv
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/sym_print_name.exp b/gdb/testsuite/gdb.ada/sym_print_name.exp
index a97979f2461..4e5995cb5e2 100644
--- a/gdb/testsuite/gdb.ada/sym_print_name.exp
+++ b/gdb/testsuite/gdb.ada/sym_print_name.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/taft_type.exp b/gdb/testsuite/gdb.ada/taft_type.exp
index 52967ade4a7..10c4696ac59 100644
--- a/gdb/testsuite/gdb.ada/taft_type.exp
+++ b/gdb/testsuite/gdb.ada/taft_type.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile p
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp
index 4d0014a3de2..8e989737f40 100644
--- a/gdb/testsuite/gdb.ada/tagged.exp
+++ b/gdb/testsuite/gdb.ada/tagged.exp
@@ -21,7 +21,7 @@ require gnat_runtime_has_debug_info
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -36,7 +36,7 @@ runto "foo.adb:$bp_location"
 gdb_test "ptype segm" \
     [multi_line "type = new pck\\.object with record" \
 	 "    width: integer;" \
-	 "end record" ]
+	 "end record"]
 
 gdb_test "print segm" \
     "= \\(position => 74, width => 8\\)"
@@ -46,7 +46,7 @@ gdb_test "print segm" \
 gdb_test "ptype obj" \
     [multi_line "type = new pck\\.object with record" \
 	 "    width: integer;" \
-	 "end record" ]
+	 "end record"]
 
 gdb_test "print obj" \
     "= \\(position => 74, width => 8\\)"
diff --git a/gdb/testsuite/gdb.ada/task_bp.exp b/gdb/testsuite/gdb.ada/task_bp.exp
index 7ebad22c0f2..6c1f8ea9487 100644
--- a/gdb/testsuite/gdb.ada/task_bp.exp
+++ b/gdb/testsuite/gdb.ada/task_bp.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/task_switch_in_core.exp b/gdb/testsuite/gdb.ada/task_switch_in_core.exp
index b10c93a7c2b..fe12441f245 100644
--- a/gdb/testsuite/gdb.ada/task_switch_in_core.exp
+++ b/gdb/testsuite/gdb.ada/task_switch_in_core.exp
@@ -19,7 +19,7 @@ require allow_ada_tests gcore_cmd_available
 
 standard_ada_testfile crash
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
@@ -58,7 +58,6 @@ if { $core_loaded == -1 } {
 gdb_test "task 1" \
     "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" \
diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp
index 9862663d566..de3aec0c06f 100644
--- a/gdb/testsuite/gdb.ada/tasks.exp
+++ b/gdb/testsuite/gdb.ada/tasks.exp
@@ -21,7 +21,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/tick_last_segv.exp b/gdb/testsuite/gdb.ada/tick_last_segv.exp
index 3bc5464b592..01d1442851e 100644
--- a/gdb/testsuite/gdb.ada/tick_last_segv.exp
+++ b/gdb/testsuite/gdb.ada/tick_last_segv.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
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 f90f1d7acc9..16c094a0ef9 100644
--- a/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp
+++ b/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_n207_004
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/type_coercion.exp b/gdb/testsuite/gdb.ada/type_coercion.exp
index 713f4344dcb..412a60ffa61 100644
--- a/gdb/testsuite/gdb.ada/type_coercion.exp
+++ b/gdb/testsuite/gdb.ada/type_coercion.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile assign
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
index 1acf9900082..1f78241ff90 100644
--- a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
+++ b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile parse
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/uninitialized_vars.exp b/gdb/testsuite/gdb.ada/uninitialized_vars.exp
index d0c389f9863..2b196fe870f 100644
--- a/gdb/testsuite/gdb.ada/uninitialized_vars.exp
+++ b/gdb/testsuite/gdb.ada/uninitialized_vars.exp
@@ -22,7 +22,7 @@ require allow_ada_tests
 
 standard_ada_testfile parse
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/var_arr_attrs.exp b/gdb/testsuite/gdb.ada/var_arr_attrs.exp
index c7fa8c65362..3c36457b617 100644
--- a/gdb/testsuite/gdb.ada/var_arr_attrs.exp
+++ b/gdb/testsuite/gdb.ada/var_arr_attrs.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo_o115_002
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/var_arr_typedef.exp b/gdb/testsuite/gdb.ada/var_arr_typedef.exp
index 53643e0fe5b..6c89b8e10dd 100644
--- a/gdb/testsuite/gdb.ada/var_arr_typedef.exp
+++ b/gdb/testsuite/gdb.ada/var_arr_typedef.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile var_arr_typedef
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/varsize_limit.exp b/gdb/testsuite/gdb.ada/varsize_limit.exp
index 11eb1fe2772..d2dd7ff399e 100644
--- a/gdb/testsuite/gdb.ada/varsize_limit.exp
+++ b/gdb/testsuite/gdb.ada/varsize_limit.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile vsizelim
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/voidctx.exp b/gdb/testsuite/gdb.ada/voidctx.exp
index 6ad4dd8c39d..b47e69cb56c 100644
--- a/gdb/testsuite/gdb.ada/voidctx.exp
+++ b/gdb/testsuite/gdb.ada/voidctx.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile voidctx
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/whatis_array_val.exp b/gdb/testsuite/gdb.ada/whatis_array_val.exp
index 366fb9f8491..46bedb947ba 100644
--- a/gdb/testsuite/gdb.ada/whatis_array_val.exp
+++ b/gdb/testsuite/gdb.ada/whatis_array_val.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/widewide.exp b/gdb/testsuite/gdb.ada/widewide.exp
index 13175d595f7..727e89181da 100644
--- a/gdb/testsuite/gdb.ada/widewide.exp
+++ b/gdb/testsuite/gdb.ada/widewide.exp
@@ -19,7 +19,7 @@ require allow_ada_tests
 
 standard_ada_testfile foo
 
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
     return
 }
 
diff --git a/gdb/testsuite/gdb.ada/win_fu_syms.exp b/gdb/testsuite/gdb.ada/win_fu_syms.exp
index ed6734576e8..9d863df03fc 100644
--- a/gdb/testsuite/gdb.ada/win_fu_syms.exp
+++ b/gdb/testsuite/gdb.ada/win_fu_syms.exp
@@ -20,7 +20,7 @@ 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]] != "" } {
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-shared additional_flags=-margs]] != ""} {
     return
 }
 
-- 
2.51.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt
  2026-03-25 16:13 ` [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
@ 2026-03-25 16:42   ` Tom de Vries
  2026-03-31  6:49   ` Tom de Vries
  1 sibling, 0 replies; 6+ messages in thread
From: Tom de Vries @ 2026-03-25 16:42 UTC (permalink / raw)
  To: gdb-patches

On 3/25/26 5:13 PM, Tom de Vries wrote:
> diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp
> index e717802a8d2..8f833159aff 100644
> --- a/gdb/testsuite/gdb.ada/info_auto_lang.exp
> +++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp
> @@ -37,7 +37,7 @@ if { [gdb_compile "${csrcfile}" "${cobject}" object [list debug]] != "" } {
>       untested "failed to compile"
>       return
>   }
> -if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
> +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != ""} {
>       untested "failed to compile"
>       return
>   }
> @@ -49,8 +49,8 @@ if {![runto "some_c.c:$bp_location"]} {
>       return
>   }
>   
> -set func_in_c(c_syntax)      "${decimal}:	void proc_in_c\\\(void\\\);"
> -set func_in_c(ada_syntax)    "${decimal}:	procedure proc_in_c;"
> +set func_in_c(c_syntax) "${decimal}:	void proc_in_c\\\(void\\\);"
> +set func_in_c(ada_syntax) "${decimal}:	procedure proc_in_c;"
I had an AI review this patch, and it pointed to this file, noting that 
this type of change "slightly reduces vertical alignment readability".

Thanks,
- Tom


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt
  2026-03-25 16:13 ` [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
  2026-03-25 16:42   ` Tom de Vries
@ 2026-03-31  6:49   ` Tom de Vries
  1 sibling, 0 replies; 6+ messages in thread
From: Tom de Vries @ 2026-03-31  6:49 UTC (permalink / raw)
  To: gdb-patches

On 3/25/26 5:13 PM, Tom de Vries wrote:
 > [1]https://github.com/nmoroze/tclint/issues/160
 > [2]https://github.com/nmoroze/tclint/issues/140

These two issues have been fixed upstream.

> Likewise in:
> - gdb.ada/data-sections.exp
This file contains:
...
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \
          {debug additional_flags=-fdata-sections 
ldflags=-Wl,--gc-sections}] \
         != ""} {
     return
}
...

Now that issue #140 has been fixed, tclfmt rewrites this to:
...
if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \
          {debug additional_flags=-fdata-sections 
ldflags=-Wl,--gc-sections}]
     != ""} {
     return
}
...
in other words, dropping the backslash at the end of the line.

The resulting formatting is also emacs-stable, that is, emacs 
auto-indent doesn't change it, but IWBN if tclfmt kept the same 
formatting.

I've filed an issue about it ( https://github.com/nmoroze/tclint/
issues/162 ).

Thanks,
- Tom


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PING][PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt
  2026-03-25 16:13 [PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
  2026-03-25 16:13 ` [PATCH 1/2] [gdb] Update tclint.style in pyproject.toml Tom de Vries
  2026-03-25 16:13 ` [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
@ 2026-04-10 12:35 ` Tom de Vries
  2 siblings, 0 replies; 6+ messages in thread
From: Tom de Vries @ 2026-04-10 12:35 UTC (permalink / raw)
  To: gdb-patches

On 3/25/26 5:13 PM, Tom de Vries wrote:
> I'd like to get to a situation where we use tclfmt as pre-commit formatter for
> the testsuite, in the same way that we use say black and isort for python
> files [1].
> 
> Of course that doesn't work if the changes are too intrusive, so I've been
> working to get tclfmt to format in a style compatible with the gdb testsuite.
> 
> My test subject for this effort has been the gdb.ada directory.
> 
> With tcl 0.8.0, most issues are fixed, so this series:
> - updates tclint.style in gdb/pyproject.toml to be less intrusive, and
> - applies tclfmt to gdb.ada (manually reverting some changes that still need
>    fixing in tclfmt).
> 

Ping.

Thanks,
- Tom

> [1] https://sourceware.org/bugzilla/show_bug.cgi?id=33724
> 
> Tom de Vries (2):
>    [gdb] Update tclint.style in pyproject.toml
>    [gdb/testsuite] Reformat gdb.ada using tclfmt
> 
>   gdb/pyproject.toml                            |  5 +++-
>   gdb/testsuite/gdb.ada/access_tagged_param.exp |  2 +-
>   .../gdb.ada/access_to_packed_array.exp        |  2 +-
>   gdb/testsuite/gdb.ada/addr_arith.exp          |  2 +-
>   gdb/testsuite/gdb.ada/arr_arr.exp             |  2 +-
>   gdb/testsuite/gdb.ada/array_bounds.exp        |  2 +-
>   .../gdb.ada/array_subscript_addr.exp          |  2 +-
>   gdb/testsuite/gdb.ada/arraydim.exp            |  2 +-
>   gdb/testsuite/gdb.ada/assign_1.exp            |  1 -
>   gdb/testsuite/gdb.ada/assign_arr.exp          |  2 +-
>   gdb/testsuite/gdb.ada/atomic_enum.exp         |  2 +-
>   .../gdb.ada/attr_ref_and_charlit.exp          |  2 +-
>   gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp |  2 +-
>   gdb/testsuite/gdb.ada/bp_c_mixed_case.exp     |  2 +-
>   gdb/testsuite/gdb.ada/bp_enum_homonym.exp     |  2 +-
>   gdb/testsuite/gdb.ada/bp_inlined_func.exp     |  2 +-
>   gdb/testsuite/gdb.ada/bp_on_var.exp           |  3 +--
>   gdb/testsuite/gdb.ada/bp_range_type.exp       |  2 +-
>   gdb/testsuite/gdb.ada/bp_reset.exp            |  2 +-
>   gdb/testsuite/gdb.ada/call_pn.exp             |  2 +-
>   gdb/testsuite/gdb.ada/catch_assert_if.exp     |  2 +-
>   gdb/testsuite/gdb.ada/catch_ex.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          |  8 +++---
>   gdb/testsuite/gdb.ada/complete.exp            | 16 ++++++------
>   gdb/testsuite/gdb.ada/cond_lang.exp           |  2 +-
>   gdb/testsuite/gdb.ada/convvar_comp.exp        |  2 +-
>   gdb/testsuite/gdb.ada/delta-assign.exp        |  2 +-
>   gdb/testsuite/gdb.ada/disc_arr_bound.exp      |  2 +-
>   gdb/testsuite/gdb.ada/dot_all.exp             |  2 +-
>   gdb/testsuite/gdb.ada/dyn_arrayidx.exp        |  2 +-
>   gdb/testsuite/gdb.ada/dyn_loc.exp             |  2 +-
>   gdb/testsuite/gdb.ada/dyn_stride.exp          |  2 +-
>   gdb/testsuite/gdb.ada/dynamic-iface.exp       |  2 +-
>   gdb/testsuite/gdb.ada/enums_overload.exp      |  2 +-
>   gdb/testsuite/gdb.ada/excep_handle.exp        |  2 +-
>   gdb/testsuite/gdb.ada/expr_delims.exp         |  4 +--
>   gdb/testsuite/gdb.ada/expr_with_funcall.exp   | 14 +++++------
>   gdb/testsuite/gdb.ada/exprs.exp               |  2 +-
>   gdb/testsuite/gdb.ada/fin_fun_out.exp         |  2 +-
>   .../gdb.ada/fixed_points_function.exp         |  2 +-
>   gdb/testsuite/gdb.ada/float-bits.exp          |  9 +++----
>   gdb/testsuite/gdb.ada/formatted_ref.exp       |  4 +--
>   gdb/testsuite/gdb.ada/frame_args.exp          |  2 +-
>   gdb/testsuite/gdb.ada/fullname_bp.exp         |  2 +-
>   gdb/testsuite/gdb.ada/fun_addr.exp            |  2 +-
>   gdb/testsuite/gdb.ada/fun_in_declare.exp      |  2 +-
>   gdb/testsuite/gdb.ada/fun_overload_menu.exp   |  3 +--
>   gdb/testsuite/gdb.ada/fun_renaming.exp        |  2 +-
>   gdb/testsuite/gdb.ada/funcall_char.exp        |  2 +-
>   gdb/testsuite/gdb.ada/funcall_param.exp       |  2 +-
>   gdb/testsuite/gdb.ada/funcall_ptr.exp         |  2 +-
>   gdb/testsuite/gdb.ada/ghost.exp               |  2 +-
>   gdb/testsuite/gdb.ada/homonym.exp             |  3 +--
>   .../gdb.ada/info_addr_mixed_case.exp          |  2 +-
>   gdb/testsuite/gdb.ada/info_auto_lang.exp      | 25 +++++++++----------
>   gdb/testsuite/gdb.ada/info_exc.exp            |  4 +--
>   gdb/testsuite/gdb.ada/inline-section-gc.exp   |  1 -
>   gdb/testsuite/gdb.ada/int_deref.exp           |  2 +-
>   gdb/testsuite/gdb.ada/interface.exp           |  2 +-
>   gdb/testsuite/gdb.ada/iterated-assign.exp     |  2 +-
>   gdb/testsuite/gdb.ada/iwide.exp               |  2 +-
>   gdb/testsuite/gdb.ada/lang_switch.exp         |  2 +-
>   gdb/testsuite/gdb.ada/length_cond.exp         |  2 +-
>   gdb/testsuite/gdb.ada/maint_with_ada.exp      |  2 +-
>   gdb/testsuite/gdb.ada/mi_catch_assert.exp     |  2 +-
>   gdb/testsuite/gdb.ada/mi_catch_ex.exp         |  2 +-
>   gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp    |  3 +--
>   gdb/testsuite/gdb.ada/mi_dyn_arr.exp          |  2 +-
>   gdb/testsuite/gdb.ada/mi_exc_info.exp         |  2 +-
>   gdb/testsuite/gdb.ada/mi_interface.exp        |  2 +-
>   gdb/testsuite/gdb.ada/mi_ref_changeable.exp   |  2 +-
>   gdb/testsuite/gdb.ada/mi_task_arg.exp         |  2 +-
>   gdb/testsuite/gdb.ada/mi_task_info.exp        |  2 +-
>   gdb/testsuite/gdb.ada/mi_var_access.exp       |  2 +-
>   gdb/testsuite/gdb.ada/minsyms.exp             |  2 +-
>   gdb/testsuite/gdb.ada/nested.exp              |  2 +-
>   gdb/testsuite/gdb.ada/non-ascii-latin-3.exp   |  2 +-
>   gdb/testsuite/gdb.ada/null_array.exp          |  2 +-
>   gdb/testsuite/gdb.ada/operator_bp.exp         |  4 +--
>   gdb/testsuite/gdb.ada/optim_drec.exp          |  2 +-
>   gdb/testsuite/gdb.ada/packed_array_assign.exp |  2 +-
>   gdb/testsuite/gdb.ada/pp-rec-component.exp    |  2 +-
>   gdb/testsuite/gdb.ada/print_chars.exp         |  3 +--
>   gdb/testsuite/gdb.ada/print_pc.exp            |  2 +-
>   gdb/testsuite/gdb.ada/ptr_typedef.exp         |  2 +-
>   gdb/testsuite/gdb.ada/ptype_array.exp         |  2 +-
>   gdb/testsuite/gdb.ada/ptype_field.exp         |  6 ++---
>   gdb/testsuite/gdb.ada/ptype_tagged_param.exp  |  2 +-
>   gdb/testsuite/gdb.ada/py_range.exp            |  2 +-
>   gdb/testsuite/gdb.ada/rdv_wait.exp            |  2 +-
>   gdb/testsuite/gdb.ada/rec_comp.exp            |  2 +-
>   gdb/testsuite/gdb.ada/rec_return.exp          |  2 +-
>   gdb/testsuite/gdb.ada/ref_param.exp           |  4 +--
>   gdb/testsuite/gdb.ada/ref_tick_size.exp       |  2 +-
>   .../gdb.ada/rename_subscript_param.exp        |  2 +-
>   gdb/testsuite/gdb.ada/repeat_dyn.exp          |  2 +-
>   gdb/testsuite/gdb.ada/same_enum.exp           |  4 +--
>   gdb/testsuite/gdb.ada/scoped_watch.exp        |  1 -
>   gdb/testsuite/gdb.ada/set_wstr.exp            |  2 +-
>   gdb/testsuite/gdb.ada/small_reg_param.exp     |  2 +-
>   gdb/testsuite/gdb.ada/str_binop_equal.exp     |  2 +-
>   gdb/testsuite/gdb.ada/str_chars.exp           |  2 +-
>   gdb/testsuite/gdb.ada/str_ref_cmp.exp         |  2 +-
>   gdb/testsuite/gdb.ada/str_uninit.exp          |  2 +-
>   gdb/testsuite/gdb.ada/sub_variant.exp         |  2 +-
>   gdb/testsuite/gdb.ada/sym_print_name.exp      |  2 +-
>   gdb/testsuite/gdb.ada/taft_type.exp           |  2 +-
>   gdb/testsuite/gdb.ada/tagged.exp              |  6 ++---
>   gdb/testsuite/gdb.ada/task_bp.exp             |  2 +-
>   gdb/testsuite/gdb.ada/task_switch_in_core.exp |  3 +--
>   gdb/testsuite/gdb.ada/tasks.exp               |  2 +-
>   gdb/testsuite/gdb.ada/tick_last_segv.exp      |  2 +-
>   .../gdb.ada/tick_length_array_enum_idx.exp    |  2 +-
>   gdb/testsuite/gdb.ada/type_coercion.exp       |  2 +-
>   .../gdb.ada/uninitialized-variable-record.exp |  2 +-
>   gdb/testsuite/gdb.ada/uninitialized_vars.exp  |  2 +-
>   gdb/testsuite/gdb.ada/var_arr_attrs.exp       |  2 +-
>   gdb/testsuite/gdb.ada/var_arr_typedef.exp     |  2 +-
>   gdb/testsuite/gdb.ada/varsize_limit.exp       |  2 +-
>   gdb/testsuite/gdb.ada/voidctx.exp             |  2 +-
>   gdb/testsuite/gdb.ada/whatis_array_val.exp    |  2 +-
>   gdb/testsuite/gdb.ada/widewide.exp            |  2 +-
>   gdb/testsuite/gdb.ada/win_fu_syms.exp         |  2 +-
>   126 files changed, 166 insertions(+), 174 deletions(-)
> 
> 
> base-commit: 1a10ac99959e8d28694cb47d0632552e6feb03b2


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2026-04-10 12:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-03-25 16:13 [PATCH 0/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
2026-03-25 16:13 ` [PATCH 1/2] [gdb] Update tclint.style in pyproject.toml Tom de Vries
2026-03-25 16:13 ` [PATCH 2/2] [gdb/testsuite] Reformat gdb.ada using tclfmt Tom de Vries
2026-03-25 16:42   ` Tom de Vries
2026-03-31  6:49   ` Tom de Vries
2026-04-10 12:35 ` [PING][PATCH 0/2] " Tom de Vries

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox