[00/14] Remove all uses of 'then' keyword from the testsuite

Message ID cover.1668508386.git.aburgess@redhat.com
Headers
Series Remove all uses of 'then' keyword from the testsuite |

Message

Andrew Burgess Nov. 15, 2022, 10:42 a.m. UTC
  It was pointed out to me (off-list) that in this patch:

  https://sourceware.org/pipermail/gdb-patches/2022-November/193744.html

I had made use of TCL's 'then' keyword, which apparently is not the
preferred way to write if statements these days, at least, not for
single line conditions.  And it certainly seems that NOT using 'then'
is more common in the GDB testsuite.

As my use of 'then' was due to copy&paste from another test, this
series aims to prevent the same mistake happening again by removing
all uses of 'then' for if statements where the condition fits on a
single line.

The change was generated with sed, I sanity checked them all by eye,
and didn't see any obvious mistakes.  Tested on x86-64 GNU/Linux and
didn't see any test regressions.

Thoughts?

Thanks,
Andrew

---

Andrew Burgess (14):
  gdb/testsuite: remove DOS line endings from a test script
  gdb/testsuite: remove use of then keyword from gdb.ada/*.exp
  gdb/testsuite: remove use of then keyword from gdb.base/*.exp
  gdb/testsuite: remove use of then keyword from gdb.arch/*.exp
  gdb/testsuite: remove use of then keyword from gdb.cp/*.exp
  gdb/testsuite: remove use of then keyword from gdb.python/*.exp
  gdb/testsuite: remove use of then keyword from gdb.threads/*.exp
  gdb/testsuite: remove use of then keyword from gdb.trace/*.exp
  gdb/testsuite: remove use of then keyword from gdb.reverse/*.exp
  gdb/testsuite: remove use of then keyword from gdb.disasm/*.exp
  gdb/testsuite: remove use of then keyword from gdb.fortran/*.exp
  gdb/testsuite: remove use of then keyword from gdb.multi/*.exp
  gdb/testsuite: remove use of then keyword from gdb.*/*.exp scripts
  gdb/testsuite: remove use of then keyword from library files

 .../boards/native-extended-gdbserver.exp      |   4 +-
 gdb/testsuite/config/sid.exp                  |  16 +-
 gdb/testsuite/config/sim.exp                  |  10 +-
 gdb/testsuite/config/slite.exp                |   8 +-
 gdb/testsuite/gdb.ada/O2_float_param.exp      |   2 +-
 gdb/testsuite/gdb.ada/access_tagged_param.exp |   2 +-
 gdb/testsuite/gdb.ada/addr_arith.exp          |   2 +-
 gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp   |   2 +-
 gdb/testsuite/gdb.ada/arr_arr.exp             |   2 +-
 gdb/testsuite/gdb.ada/arr_enum_idx_w_gap.exp  |   2 +-
 gdb/testsuite/gdb.ada/array_bounds.exp        |   2 +-
 gdb/testsuite/gdb.ada/array_return.exp        |   4 +-
 gdb/testsuite/gdb.ada/arrayptr.exp            |   2 +-
 gdb/testsuite/gdb.ada/bp_c_mixed_case.exp     |   2 +-
 gdb/testsuite/gdb.ada/bp_inlined_func.exp     |   2 +-
 gdb/testsuite/gdb.ada/call_pn.exp             |   2 +-
 gdb/testsuite/gdb.ada/catch_assert_if.exp     |   4 +-
 gdb/testsuite/gdb.ada/catch_ex.exp            |   6 +-
 gdb/testsuite/gdb.ada/catch_ex_std.exp        |   2 +-
 gdb/testsuite/gdb.ada/convvar_comp.exp        |   2 +-
 gdb/testsuite/gdb.ada/disc_arr_bound.exp      |   2 +-
 gdb/testsuite/gdb.ada/discrete-char.exp       |   2 +-
 gdb/testsuite/gdb.ada/dot_all.exp             |   2 +-
 gdb/testsuite/gdb.ada/dyn_loc.exp             |   2 +-
 gdb/testsuite/gdb.ada/dyn_stride.exp          |   2 +-
 gdb/testsuite/gdb.ada/excep_handle.exp        |   2 +-
 gdb/testsuite/gdb.ada/frame_args.exp          |   2 +-
 gdb/testsuite/gdb.ada/fun_in_declare.exp      |   2 +-
 gdb/testsuite/gdb.ada/ghost.exp               |   2 +-
 .../gdb.ada/info_addr_mixed_case.exp          |   2 +-
 gdb/testsuite/gdb.ada/info_auto_lang.exp      |   2 +-
 gdb/testsuite/gdb.ada/info_exc.exp            |   2 +-
 gdb/testsuite/gdb.ada/local-enum.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    |   2 +-
 gdb/testsuite/gdb.ada/mi_ex_cond.exp          |   2 +-
 gdb/testsuite/gdb.ada/mi_task_arg.exp         |   2 +-
 gdb/testsuite/gdb.ada/mi_task_info.exp        |   2 +-
 gdb/testsuite/gdb.ada/minsyms.exp             |   2 +-
 gdb/testsuite/gdb.ada/mod_from_name.exp       |   2 +-
 gdb/testsuite/gdb.ada/optim_drec.exp          |   2 +-
 gdb/testsuite/gdb.ada/ptype_tagged_param.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           |   2 +-
 gdb/testsuite/gdb.ada/scalar_storage.exp      |   2 +-
 gdb/testsuite/gdb.ada/set_wstr.exp            |   2 +-
 gdb/testsuite/gdb.ada/small_reg_param.exp     |   2 +-
 gdb/testsuite/gdb.ada/str_uninit.exp          |   2 +-
 gdb/testsuite/gdb.ada/taft_type.exp           |   2 +-
 gdb/testsuite/gdb.ada/task_switch_in_core.exp |   2 +-
 gdb/testsuite/gdb.ada/varsize_limit.exp       |   2 +-
 gdb/testsuite/gdb.ada/whatis_array_val.exp    |   2 +-
 gdb/testsuite/gdb.ada/widewide.exp            |   2 +-
 gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp  |   2 +-
 gdb/testsuite/gdb.arch/alpha-step.exp         |   4 +-
 gdb/testsuite/gdb.arch/altivec-abi.exp        |   4 +-
 gdb/testsuite/gdb.arch/altivec-regs.exp       |   4 +-
 gdb/testsuite/gdb.arch/amd64-byte.exp         |   2 +-
 .../gdb.arch/amd64-disp-step-avx.exp          |   2 +-
 gdb/testsuite/gdb.arch/amd64-disp-step.exp    |   2 +-
 gdb/testsuite/gdb.arch/amd64-dword.exp        |   2 +-
 gdb/testsuite/gdb.arch/amd64-gs_base.exp      |   2 +-
 .../gdb.arch/amd64-init-x87-values.exp        |   8 +-
 gdb/testsuite/gdb.arch/amd64-word.exp         |   2 +-
 .../gdb.arch/arc-analyze-prologue.exp         |   2 +-
 gdb/testsuite/gdb.arch/arc-decode-insn.exp    |   2 +-
 .../gdb.arch/arc-disassembler-options.exp     |   2 +-
 .../gdb.arch/arm-disassembler-options.exp     |   2 +-
 gdb/testsuite/gdb.arch/arm-disp-step.exp      |   4 +-
 gdb/testsuite/gdb.arch/e500-abi.exp           |   4 +-
 gdb/testsuite/gdb.arch/e500-prologue.exp      |   4 +-
 gdb/testsuite/gdb.arch/e500-regs.exp          |   6 +-
 gdb/testsuite/gdb.arch/gdb1291.exp            |   4 +-
 gdb/testsuite/gdb.arch/gdb1431.exp            |   4 +-
 gdb/testsuite/gdb.arch/gdb1558.exp            |   2 +-
 gdb/testsuite/gdb.arch/i386-avx.exp           |   4 +-
 gdb/testsuite/gdb.arch/i386-biarch-core.exp   |   2 +-
 gdb/testsuite/gdb.arch/i386-bp_permanent.exp  |   4 +-
 gdb/testsuite/gdb.arch/i386-byte.exp          |   4 +-
 gdb/testsuite/gdb.arch/i386-disp-step.exp     |   4 +-
 gdb/testsuite/gdb.arch/i386-dr3-watch.exp     |   4 +-
 gdb/testsuite/gdb.arch/i386-float.exp         |   4 +-
 gdb/testsuite/gdb.arch/i386-gnu-cfi.exp       |   4 +-
 gdb/testsuite/gdb.arch/i386-permbkpt.exp      |   2 +-
 gdb/testsuite/gdb.arch/i386-prologue.exp      |   4 +-
 gdb/testsuite/gdb.arch/i386-signal.exp        |   2 +-
 gdb/testsuite/gdb.arch/i386-size-overlap.exp  |   2 +-
 gdb/testsuite/gdb.arch/i386-size.exp          |   2 +-
 .../gdb.arch/i386-sse-stack-align.exp         |   2 +-
 gdb/testsuite/gdb.arch/i386-sse.exp           |   2 +-
 gdb/testsuite/gdb.arch/i386-unwind.exp        |   2 +-
 gdb/testsuite/gdb.arch/i386-word.exp          |   4 +-
 gdb/testsuite/gdb.arch/iwmmxt-regs.exp        |   4 +-
 .../gdb.arch/mips-disassembler-options.exp    |   2 +-
 gdb/testsuite/gdb.arch/mips-fcr.exp           |   2 +-
 gdb/testsuite/gdb.arch/mips-fpregset-core.exp |   4 +-
 gdb/testsuite/gdb.arch/mips16-thunks.exp      |  14 +-
 gdb/testsuite/gdb.arch/pa-nullify.exp         |   6 +-
 gdb/testsuite/gdb.arch/powerpc-addpcis.exp    |   2 +-
 .../gdb.arch/powerpc-aix-prologue.exp         |   4 +-
 gdb/testsuite/gdb.arch/powerpc-altivec.exp    |   2 +-
 gdb/testsuite/gdb.arch/powerpc-altivec2.exp   |   2 +-
 gdb/testsuite/gdb.arch/powerpc-altivec3.exp   |   2 +-
 gdb/testsuite/gdb.arch/powerpc-d128-regs.exp  |   4 +-
 .../gdb.arch/powerpc-disassembler-options.exp |   2 +-
 .../gdb.arch/powerpc-fpscr-gcore.exp          |   4 +-
 gdb/testsuite/gdb.arch/powerpc-htm-regs.exp   |   2 +-
 gdb/testsuite/gdb.arch/powerpc-lnia.exp       |   2 +-
 .../gdb.arch/powerpc-plxv-nonrel.exp          |   2 +-
 gdb/testsuite/gdb.arch/powerpc-power10.exp    |   2 +-
 gdb/testsuite/gdb.arch/powerpc-power7.exp     |   2 +-
 gdb/testsuite/gdb.arch/powerpc-power8.exp     |   2 +-
 gdb/testsuite/gdb.arch/powerpc-power9.exp     |   2 +-
 gdb/testsuite/gdb.arch/powerpc-ppr-dscr.exp   |   2 +-
 gdb/testsuite/gdb.arch/powerpc-prologue.exp   |   4 +-
 gdb/testsuite/gdb.arch/powerpc-stackless.exp  |   2 +-
 gdb/testsuite/gdb.arch/powerpc-tar.exp        |   2 +-
 gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp  |   4 +-
 gdb/testsuite/gdb.arch/powerpc-vsx.exp        |   2 +-
 gdb/testsuite/gdb.arch/powerpc-vsx2.exp       |   2 +-
 gdb/testsuite/gdb.arch/powerpc-vsx3.exp       |   2 +-
 gdb/testsuite/gdb.arch/powerpc64-prologue.exp |   4 +-
 gdb/testsuite/gdb.arch/ppc-dfp.exp            |   2 +-
 gdb/testsuite/gdb.arch/ppc-fp.exp             |   2 +-
 gdb/testsuite/gdb.arch/ppc-longdouble.exp     |   6 +-
 gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp  |   2 +-
 .../gdb.arch/ppc64-break-on-_exit.exp         |   2 +-
 .../gdb.arch/ppc64-isa207-atomic-inst.exp     |   2 +-
 gdb/testsuite/gdb.arch/pr25124.exp            |   2 +-
 gdb/testsuite/gdb.arch/riscv-bp-infcall.exp   |   2 +-
 gdb/testsuite/gdb.arch/riscv-info-fcsr.exp    |   2 +-
 gdb/testsuite/gdb.arch/riscv-reg-aliases.exp  |   2 +-
 .../gdb.arch/riscv-unwind-long-insn.exp       |   2 +-
 .../riscv64-unwind-prologue-with-ld-lw.exp    |   2 +-
 .../riscv64-unwind-prologue-with-mv.exp       |   2 +-
 .../gdb.arch/s390-disassembler-options.exp    |   2 +-
 gdb/testsuite/gdb.arch/s390-stackless.exp     |   2 +-
 gdb/testsuite/gdb.arch/s390-tdbregs.exp       |   2 +-
 gdb/testsuite/gdb.arch/sparc-sysstep.exp      |   2 +-
 gdb/testsuite/gdb.arch/sparc64-adi.exp        |   4 +-
 gdb/testsuite/gdb.arch/sparc64-regs.exp       |   4 +-
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp        |   4 +-
 gdb/testsuite/gdb.arch/thumb-prologue.exp     |   4 +-
 gdb/testsuite/gdb.arch/thumb-singlestep.exp   |   4 +-
 gdb/testsuite/gdb.arch/thumb2-it.exp          |   4 +-
 gdb/testsuite/gdb.arch/vsx-regs.exp           |   4 +-
 gdb/testsuite/gdb.arch/vsx-vsr-float28.exp    |   4 +-
 gdb/testsuite/gdb.asm/asm-source.exp          |  14 +-
 gdb/testsuite/gdb.base/a2-run.exp             |   4 +-
 gdb/testsuite/gdb.base/advance.exp            |   2 +-
 gdb/testsuite/gdb.base/alias.exp              |   2 +-
 gdb/testsuite/gdb.base/all-bin.exp            |   2 +-
 .../gdb.base/annota-input-while-running.exp   |   2 +-
 gdb/testsuite/gdb.base/annota1.exp            |   2 +-
 gdb/testsuite/gdb.base/anon.exp               |   2 +-
 gdb/testsuite/gdb.base/arithmet.exp           |   2 +-
 gdb/testsuite/gdb.base/arrayidx.exp           |   2 +-
 gdb/testsuite/gdb.base/assign.exp             |   2 +-
 gdb/testsuite/gdb.base/async.exp              |   2 +-
 gdb/testsuite/gdb.base/attach-wait-input.exp  |   2 +-
 gdb/testsuite/gdb.base/attach.exp             |   2 +-
 .../gdb.base/auto-connect-native-target.exp   |   2 +-
 gdb/testsuite/gdb.base/auxv.exp               |   2 +-
 gdb/testsuite/gdb.base/backtrace.exp          |   2 +-
 gdb/testsuite/gdb.base/bfp-test.exp           |   2 +-
 gdb/testsuite/gdb.base/bigcore.exp            |   4 +-
 gdb/testsuite/gdb.base/bitfields2.exp         |   8 +-
 gdb/testsuite/gdb.base/bp-permanent.exp       |   2 +-
 gdb/testsuite/gdb.base/break-idempotent.exp   |   2 +-
 gdb/testsuite/gdb.base/break-unload-file.exp  |   2 +-
 gdb/testsuite/gdb.base/break.exp              |  14 +-
 .../gdb.base/bt-on-error-and-warning.exp      |   2 +-
 gdb/testsuite/gdb.base/bt-on-fatal-signal.exp |   2 +-
 gdb/testsuite/gdb.base/bt-selected-frame.exp  |   2 +-
 gdb/testsuite/gdb.base/call-ar-st.exp         |   4 +-
 gdb/testsuite/gdb.base/call-rt-st.exp         |   2 +-
 gdb/testsuite/gdb.base/call-sc.exp            |   2 +-
 gdb/testsuite/gdb.base/call-strs.exp          |   2 +-
 gdb/testsuite/gdb.base/callfuncs.exp          |  10 +-
 gdb/testsuite/gdb.base/catch-fork-static.exp  |   2 +-
 .../gdb.base/catch-signal-siginfo-cond.exp    |   2 +-
 gdb/testsuite/gdb.base/catch-syscall.exp      |  28 +--
 gdb/testsuite/gdb.base/checkpoint.exp         |   2 +-
 gdb/testsuite/gdb.base/clear_non_user_bp.exp  |   2 +-
 gdb/testsuite/gdb.base/compare-sections.exp   |   2 +-
 gdb/testsuite/gdb.base/completion.exp         |   2 +-
 gdb/testsuite/gdb.base/complex-parts.exp      |   2 +-
 gdb/testsuite/gdb.base/complex.exp            |   6 +-
 gdb/testsuite/gdb.base/cond-eval-mode.exp     |   2 +-
 gdb/testsuite/gdb.base/cond-expr.exp          |   2 +-
 .../gdb.base/condbreak-call-false.exp         |   2 +-
 .../gdb.base/consecutive-step-over.exp        |   2 +-
 gdb/testsuite/gdb.base/consecutive.exp        |   8 +-
 gdb/testsuite/gdb.base/constvars.exp          |   4 +-
 gdb/testsuite/gdb.base/coredump-filter.exp    |   2 +-
 gdb/testsuite/gdb.base/corefile.exp           |   6 +-
 gdb/testsuite/gdb.base/corefile2.exp          |   4 +-
 gdb/testsuite/gdb.base/ctf-constvars.exp      |   2 +-
 gdb/testsuite/gdb.base/ctf-ptype.exp          |  10 +-
 gdb/testsuite/gdb.base/decl-before-def.exp    |   2 +-
 gdb/testsuite/gdb.base/default.exp            |  10 +-
 gdb/testsuite/gdb.base/define.exp             |   2 +-
 gdb/testsuite/gdb.base/dfp-test.exp           |   2 +-
 gdb/testsuite/gdb.base/disabled-location.exp  |   2 +-
 gdb/testsuite/gdb.base/display.exp            |   2 +-
 gdb/testsuite/gdb.base/dprintf-detach.exp     |   2 +-
 gdb/testsuite/gdb.base/dump.exp               |  20 +-
 gdb/testsuite/gdb.base/duplicate-bp.exp       |   2 +-
 gdb/testsuite/gdb.base/eh_return.exp          |   2 +-
 gdb/testsuite/gdb.base/ena-dis-br.exp         |  16 +-
 gdb/testsuite/gdb.base/endianity.exp          |   2 +-
 gdb/testsuite/gdb.base/enum_cond.exp          |   2 +-
 gdb/testsuite/gdb.base/eval-skip.exp          |   2 +-
 gdb/testsuite/gdb.base/exe-lock.exp           |   2 +-
 .../gdb.base/exec-invalid-sysroot.exp         |   2 +-
 .../gdb.base/execl-update-breakpoints.exp     |   6 +-
 gdb/testsuite/gdb.base/exprs.exp              |   2 +-
 gdb/testsuite/gdb.base/fileio.exp             |   2 +-
 gdb/testsuite/gdb.base/finish.exp             |   4 +-
 gdb/testsuite/gdb.base/fixsection.exp         |   2 +-
 gdb/testsuite/gdb.base/float.exp              |  30 +--
 gdb/testsuite/gdb.base/float128.exp           |   2 +-
 gdb/testsuite/gdb.base/floatn.exp             |   2 +-
 gdb/testsuite/gdb.base/foll-exec-mode.exp     |   6 +-
 gdb/testsuite/gdb.base/foll-exec.exp          |  14 +-
 gdb/testsuite/gdb.base/foll-vfork.exp         |   2 +-
 gdb/testsuite/gdb.base/fork-running-state.exp |   2 +-
 gdb/testsuite/gdb.base/frame-args.exp         |   2 +-
 .../gdb.base/frame-info-consistent.exp        |   2 +-
 gdb/testsuite/gdb.base/frameapply.exp         |   2 +-
 gdb/testsuite/gdb.base/funcargs.exp           |  28 +--
 .../gdb.base/gcore-buffer-overflow.exp        |   2 +-
 gdb/testsuite/gdb.base/gcore.exp              |   8 +-
 gdb/testsuite/gdb.base/gdb1090.exp            |   2 +-
 gdb/testsuite/gdb.base/gdb11530.exp           |   2 +-
 gdb/testsuite/gdb.base/gdb11531.exp           |   2 +-
 gdb/testsuite/gdb.base/gdb1250.exp            |   2 +-
 gdb/testsuite/gdb.base/gdb1555.exp            |   2 +-
 gdb/testsuite/gdb.base/gdb1821.exp            |   2 +-
 gdb/testsuite/gdb.base/gnu-ifunc.exp          |   4 +-
 gdb/testsuite/gdb.base/gnu_vector.exp         |   2 +-
 gdb/testsuite/gdb.base/gold-gdb-index.exp     |   2 +-
 .../gdb.base/hbreak-in-shr-unsupported.exp    |   2 +-
 gdb/testsuite/gdb.base/hbreak2.exp            |   8 +-
 gdb/testsuite/gdb.base/hook-stop.exp          |   2 +-
 gdb/testsuite/gdb.base/huge.exp               |   2 +-
 gdb/testsuite/gdb.base/infcall-input.exp      |   2 +-
 gdb/testsuite/gdb.base/inferior-args.exp      |   2 +-
 gdb/testsuite/gdb.base/inferior-died.exp      |   2 +-
 gdb/testsuite/gdb.base/info-fun.exp           |   2 +-
 .../info-locals-unused-static-var.exp         |   2 +-
 gdb/testsuite/gdb.base/info-os.exp            |   6 +-
 gdb/testsuite/gdb.base/info-proc.exp          |   2 +-
 gdb/testsuite/gdb.base/info-program.exp       |   2 +-
 gdb/testsuite/gdb.base/info_qt.exp            |   2 +-
 .../gdb.base/inline-frame-cycle-unwind.exp    |   2 +-
 gdb/testsuite/gdb.base/interp.exp             |   2 +-
 gdb/testsuite/gdb.base/interrupt.exp          |   4 +-
 gdb/testsuite/gdb.base/jit-reader-exec.exp    |   2 +-
 gdb/testsuite/gdb.base/jump.exp               |   2 +-
 .../gdb.base/label-without-address.exp        |   2 +-
 gdb/testsuite/gdb.base/langs.exp              |  12 +-
 gdb/testsuite/gdb.base/large-frame.exp        |   2 +-
 .../gdb.base/list-missing-source.exp          |   2 +-
 gdb/testsuite/gdb.base/list.exp               |   8 +-
 gdb/testsuite/gdb.base/logical.exp            |   2 +-
 .../gdb.base/long-inferior-output.exp         |   2 +-
 gdb/testsuite/gdb.base/long_long.exp          |   2 +-
 gdb/testsuite/gdb.base/longjmp.exp            |   2 +-
 .../gdb.base/maint-info-sections.exp          |   2 +-
 .../gdb.base/maint-print-frame-id.exp         |   2 +-
 gdb/testsuite/gdb.base/maint.exp              |   2 +-
 gdb/testsuite/gdb.base/max-value-size.exp     |   6 +-
 gdb/testsuite/gdb.base/memattr.exp            |  16 +-
 gdb/testsuite/gdb.base/mips_pro.exp           |   6 +-
 gdb/testsuite/gdb.base/miscexprs.exp          |   2 +-
 gdb/testsuite/gdb.base/multi-forks.exp        |   2 +-
 gdb/testsuite/gdb.base/nodebug.exp            |   4 +-
 .../gdb.base/non-lazy-array-index.exp         |   2 +-
 gdb/testsuite/gdb.base/noreturn-finish.exp    |   2 +-
 gdb/testsuite/gdb.base/noreturn-return.exp    |   2 +-
 gdb/testsuite/gdb.base/opaque.exp             |  10 +-
 gdb/testsuite/gdb.base/overlays.exp           |  14 +-
 .../paginate-after-ctrl-c-running.exp         |   2 +-
 .../gdb.base/paginate-bg-execution.exp        |   2 +-
 .../gdb.base/paginate-inferior-exit.exp       |   2 +-
 gdb/testsuite/gdb.base/pc-fp.exp              |   2 +-
 gdb/testsuite/gdb.base/permissions.exp        |   2 +-
 gdb/testsuite/gdb.base/pie-execl.exp          |   4 +-
 gdb/testsuite/gdb.base/pointers.exp           |   2 +-
 gdb/testsuite/gdb.base/pr11022.exp            |   2 +-
 .../premature-dummy-frame-removal.exp         |   2 +-
 gdb/testsuite/gdb.base/printcmds.exp          |   2 +-
 gdb/testsuite/gdb.base/prologue.exp           |   2 +-
 gdb/testsuite/gdb.base/ptype.exp              |  12 +-
 gdb/testsuite/gdb.base/quit-live.exp          |   2 +-
 gdb/testsuite/gdb.base/radix.exp              |   4 +-
 gdb/testsuite/gdb.base/readnever.exp          |   2 +-
 gdb/testsuite/gdb.base/recurse.exp            |   2 +-
 gdb/testsuite/gdb.base/reggroups.exp          |   2 +-
 gdb/testsuite/gdb.base/relational.exp         |   2 +-
 gdb/testsuite/gdb.base/remote.exp             |  10 +-
 gdb/testsuite/gdb.base/return.exp             |   2 +-
 gdb/testsuite/gdb.base/return2.exp            |   6 +-
 gdb/testsuite/gdb.base/savedregs.exp          |   2 +-
 gdb/testsuite/gdb.base/scope.exp              |  60 +++---
 gdb/testsuite/gdb.base/sect-cmd.exp           |   2 +-
 gdb/testsuite/gdb.base/sepdebug.exp           |  16 +-
 gdb/testsuite/gdb.base/set-noassign.exp       |   2 +-
 gdb/testsuite/gdb.base/setshow.exp            |   4 +-
 gdb/testsuite/gdb.base/setvar.exp             |   4 +-
 gdb/testsuite/gdb.base/shlib-call.exp         |   2 +-
 gdb/testsuite/gdb.base/shreloc.exp            |   2 +-
 gdb/testsuite/gdb.base/sigall.exp             |   8 +-
 gdb/testsuite/gdb.base/sigaltstack.exp        |   2 +-
 gdb/testsuite/gdb.base/sigbpt.exp             |   2 +-
 gdb/testsuite/gdb.base/siginfo-addr.exp       |   2 +-
 gdb/testsuite/gdb.base/siginfo-obj.exp        |   4 +-
 gdb/testsuite/gdb.base/siginfo-thread.exp     |   2 +-
 gdb/testsuite/gdb.base/siginfo.exp            |   2 +-
 .../gdb.base/signals-state-child.exp          |   2 +-
 gdb/testsuite/gdb.base/signals.exp            |   2 +-
 gdb/testsuite/gdb.base/signest.exp            |   2 +-
 gdb/testsuite/gdb.base/signull.exp            |   2 +-
 gdb/testsuite/gdb.base/sigrepeat.exp          |   2 +-
 gdb/testsuite/gdb.base/sizeof.exp             |   2 +-
 gdb/testsuite/gdb.base/so-impl-ld.exp         |   2 +-
 gdb/testsuite/gdb.base/solib-disc.exp         |   2 +-
 gdb/testsuite/gdb.base/solib-display.exp      |   2 +-
 gdb/testsuite/gdb.base/solib-symbol.exp       |   2 +-
 gdb/testsuite/gdb.base/source-dir.exp         |   2 +-
 gdb/testsuite/gdb.base/source-execution.exp   |   2 +-
 gdb/testsuite/gdb.base/sss-bp-on-user-bp.exp  |   2 +-
 gdb/testsuite/gdb.base/stack-checking.exp     |   2 +-
 gdb/testsuite/gdb.base/stack-protector.exp    |   2 +-
 gdb/testsuite/gdb.base/step-break.exp         |   2 +-
 gdb/testsuite/gdb.base/step-line.exp          |   2 +-
 gdb/testsuite/gdb.base/step-over-syscall.exp  |   4 +-
 gdb/testsuite/gdb.base/step-test.exp          |   4 +-
 gdb/testsuite/gdb.base/store.exp              |   2 +-
 gdb/testsuite/gdb.base/structs.exp            |   2 +-
 gdb/testsuite/gdb.base/structs2.exp           |   2 +-
 gdb/testsuite/gdb.base/sym-file.exp           |  12 +-
 gdb/testsuite/gdb.base/symbol-alias.exp       |   2 +-
 gdb/testsuite/gdb.base/term.exp               |   2 +-
 gdb/testsuite/gdb.base/twice.exp              |   2 +-
 gdb/testsuite/gdb.base/type-opaque.exp        |   2 +-
 gdb/testsuite/gdb.base/until.exp              |   2 +-
 .../gdb.base/unwind-on-each-insn.exp          |   2 +-
 gdb/testsuite/gdb.base/varargs.exp            |   2 +-
 gdb/testsuite/gdb.base/volatile.exp           |   4 +-
 gdb/testsuite/gdb.base/watch-cond-infcall.exp |   2 +-
 gdb/testsuite/gdb.base/watch-cond.exp         |   6 +-
 gdb/testsuite/gdb.base/watch-non-mem.exp      |   2 +-
 gdb/testsuite/gdb.base/watch-read.exp         |   2 +-
 gdb/testsuite/gdb.base/watch-vfork.exp        |   2 +-
 gdb/testsuite/gdb.base/watch_thread_num.exp   |   2 +-
 .../gdb.base/watchpoint-reuse-slot.exp        |   2 +-
 .../watchpoint-stops-at-right-insn.exp        |   4 +-
 gdb/testsuite/gdb.base/watchpoint.exp         |  18 +-
 gdb/testsuite/gdb.base/wchar.exp              |   2 +-
 gdb/testsuite/gdb.base/whatis-exp.exp         |   2 +-
 .../gdb.base/whatis-ptype-typedefs.exp        |   4 +-
 gdb/testsuite/gdb.base/whatis.exp             |   6 +-
 gdb/testsuite/gdb.compile/compile-tls.exp     |   2 +-
 gdb/testsuite/gdb.cp/ambiguous.exp            |   2 +-
 gdb/testsuite/gdb.cp/anon-union.exp           |   2 +-
 gdb/testsuite/gdb.cp/breakpoint.exp           |   2 +-
 gdb/testsuite/gdb.cp/bs15503.exp              |   2 +-
 gdb/testsuite/gdb.cp/casts.exp                |   4 +-
 gdb/testsuite/gdb.cp/class2.exp               |   2 +-
 gdb/testsuite/gdb.cp/classes.exp              |   2 +-
 gdb/testsuite/gdb.cp/converts.exp             |   2 +-
 gdb/testsuite/gdb.cp/ctti.exp                 |   4 +-
 gdb/testsuite/gdb.cp/derivation.exp           |   2 +-
 gdb/testsuite/gdb.cp/disasm-func-name.exp     |   2 +-
 gdb/testsuite/gdb.cp/dispcxx.exp              |   2 +-
 gdb/testsuite/gdb.cp/ena-dis-br-range.exp     |   2 +-
 gdb/testsuite/gdb.cp/filename.exp             |   2 +-
 gdb/testsuite/gdb.cp/fpointer.exp             |   2 +-
 gdb/testsuite/gdb.cp/gdb1355.exp              |   2 +-
 gdb/testsuite/gdb.cp/gdb2384.exp              |   2 +-
 gdb/testsuite/gdb.cp/gdb2495.exp              |   4 +-
 gdb/testsuite/gdb.cp/inherit.exp              |   4 +-
 gdb/testsuite/gdb.cp/koenig.exp               |   2 +-
 gdb/testsuite/gdb.cp/local-static.exp         |   2 +-
 gdb/testsuite/gdb.cp/local.exp                |   4 +-
 gdb/testsuite/gdb.cp/m-data.exp               |   2 +-
 gdb/testsuite/gdb.cp/m-static.exp             |   2 +-
 gdb/testsuite/gdb.cp/mb-ctor.exp              |   2 +-
 gdb/testsuite/gdb.cp/member-name.exp          |   2 +-
 gdb/testsuite/gdb.cp/member-ptr.exp           |   2 +-
 gdb/testsuite/gdb.cp/method-call-in-c.exp     |   2 +-
 gdb/testsuite/gdb.cp/method.exp               |   2 +-
 .../gdb.cp/namespace-nested-import.exp        |   2 +-
 gdb/testsuite/gdb.cp/namespace.exp            |   6 +-
 gdb/testsuite/gdb.cp/nextoverthrow.exp        |   2 +-
 gdb/testsuite/gdb.cp/nsdecl.exp               |   2 +-
 gdb/testsuite/gdb.cp/nsimport.exp             |   2 +-
 gdb/testsuite/gdb.cp/nsnested.exp             |   2 +-
 gdb/testsuite/gdb.cp/nsnoimports.exp          |   2 +-
 gdb/testsuite/gdb.cp/nsrecurs.exp             |   2 +-
 gdb/testsuite/gdb.cp/nsstress.exp             |   2 +-
 gdb/testsuite/gdb.cp/nsusing.exp              |   4 +-
 gdb/testsuite/gdb.cp/operator.exp             |   2 +-
 gdb/testsuite/gdb.cp/oranking.exp             |   2 +-
 gdb/testsuite/gdb.cp/overload.exp             |   4 +-
 gdb/testsuite/gdb.cp/pr-1023.exp              |   2 +-
 gdb/testsuite/gdb.cp/pr-1210.exp              |   2 +-
 gdb/testsuite/gdb.cp/pr-574.exp               |   2 +-
 gdb/testsuite/gdb.cp/pr10687.exp              |   2 +-
 gdb/testsuite/gdb.cp/pr10728.exp              |   2 +-
 gdb/testsuite/gdb.cp/pr12028.exp              |   2 +-
 gdb/testsuite/gdb.cp/pr9067.exp               |   2 +-
 gdb/testsuite/gdb.cp/pr9167.exp               |   2 +-
 gdb/testsuite/gdb.cp/pr9631.exp               |   2 +-
 gdb/testsuite/gdb.cp/printmethod.exp          |   2 +-
 gdb/testsuite/gdb.cp/ptype-flags.exp          |   2 +-
 gdb/testsuite/gdb.cp/ref-types.exp            |  10 +-
 gdb/testsuite/gdb.cp/rtti.exp                 |   2 +-
 gdb/testsuite/gdb.cp/rvalue-ref-types.exp     |   2 +-
 gdb/testsuite/gdb.cp/shadow.exp               |   2 +-
 gdb/testsuite/gdb.cp/smartp.exp               |   2 +-
 gdb/testsuite/gdb.cp/try_catch.exp            |   2 +-
 gdb/testsuite/gdb.cp/userdef.exp              |   2 +-
 gdb/testsuite/gdb.cp/virtbase.exp             |   2 +-
 gdb/testsuite/gdb.cp/virtbase2.exp            |   2 +-
 gdb/testsuite/gdb.cp/virtfunc.exp             |   2 +-
 gdb/testsuite/gdb.cp/virtfunc2.exp            |   2 +-
 gdb/testsuite/gdb.cp/watch-cp.exp             |   2 +-
 gdb/testsuite/gdb.cp/wide_char_types.exp      |   2 +-
 gdb/testsuite/gdb.ctf/funcreturn.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t01_mov.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t02_mova.exp         |   4 +-
 gdb/testsuite/gdb.disasm/t03_add.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t04_sub.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t05_cmp.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t06_ari2.exp         |   4 +-
 gdb/testsuite/gdb.disasm/t07_ari3.exp         |   4 +-
 gdb/testsuite/gdb.disasm/t08_or.exp           |   4 +-
 gdb/testsuite/gdb.disasm/t09_xor.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t10_and.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t11_logs.exp         |   4 +-
 gdb/testsuite/gdb.disasm/t12_bit.exp          |   4 +-
 gdb/testsuite/gdb.disasm/t13_otr.exp          |   4 +-
 gdb/testsuite/gdb.dwarf2/dw2-common-block.exp |   2 +-
 .../gdb.dwarf2/dw2-cp-infcall-ref-static.exp  |   2 +-
 .../gdb.dwarf2/dw2-linkage-name-trust.exp     |   2 +-
 .../dw2-single-line-discriminators.exp        |   2 +-
 .../locexpr-data-member-location.exp          |   4 +-
 gdb/testsuite/gdb.fortran/array-element.exp   |   2 +-
 gdb/testsuite/gdb.fortran/block-data.exp      |   2 +-
 gdb/testsuite/gdb.fortran/common-block.exp    |   2 +-
 gdb/testsuite/gdb.fortran/complex.exp         |   2 +-
 .../gdb.fortran/derived-type-function.exp     |   2 +-
 .../gdb.fortran/derived-type-striding.exp     |   2 +-
 gdb/testsuite/gdb.fortran/derived-type.exp    |   2 +-
 gdb/testsuite/gdb.fortran/dot-ops.exp         |   2 +-
 gdb/testsuite/gdb.fortran/exprs.exp           |   2 +-
 gdb/testsuite/gdb.fortran/function-calls.exp  |   2 +-
 gdb/testsuite/gdb.fortran/library-module.exp  |   2 +-
 gdb/testsuite/gdb.fortran/module.exp          |   2 +-
 gdb/testsuite/gdb.fortran/namelist.exp        |   2 +-
 gdb/testsuite/gdb.fortran/nested-funcs-2.exp  |   2 +-
 gdb/testsuite/gdb.fortran/nested-funcs.exp    | 184 +++++++++---------
 gdb/testsuite/gdb.fortran/printing-types.exp  |   2 +-
 gdb/testsuite/gdb.fortran/ptr-indentation.exp |   2 +-
 .../gdb.fortran/ptype-on-functions.exp        |   2 +-
 .../short-circuit-argument-list.exp           |   2 +-
 gdb/testsuite/gdb.fortran/subarray.exp        |   2 +-
 gdb/testsuite/gdb.fortran/type-kinds.exp      |   2 +-
 gdb/testsuite/gdb.fortran/types.exp           |   2 +-
 gdb/testsuite/gdb.fortran/vla-value.exp       |   2 +-
 gdb/testsuite/gdb.guile/scm-breakpoint.exp    |   2 +-
 .../gdb.mi/list-thread-groups-available.exp   |   2 +-
 gdb/testsuite/gdb.mi/mi-async.exp             |   2 +-
 gdb/testsuite/gdb.mi/mi-corefile.exp          |   2 +-
 gdb/testsuite/gdb.mi/mi-frame-regs.exp        |   4 +-
 gdb/testsuite/gdb.mi/mi-info-os.exp           |   4 +-
 gdb/testsuite/gdb.mi/mi-regs.exp              |   2 +-
 gdb/testsuite/gdb.modula2/max-depth.exp       |   2 +-
 gdb/testsuite/gdb.modula2/multidim.exp        |   2 +-
 gdb/testsuite/gdb.modula2/unbounded-array.exp |   2 +-
 gdb/testsuite/gdb.multi/base.exp              |   8 +-
 gdb/testsuite/gdb.multi/bkpt-multi-exec.exp   |   4 +-
 .../gdb.multi/dummy-frame-restore.exp         |   4 +-
 gdb/testsuite/gdb.multi/info-threads.exp      |   2 +-
 gdb/testsuite/gdb.multi/multi-arch-exec.exp   |   2 +-
 gdb/testsuite/gdb.multi/multi-arch.exp        |   4 +-
 gdb/testsuite/gdb.multi/multi-re-run.exp      |   2 +-
 gdb/testsuite/gdb.multi/tids-gid-reset.exp    |   8 +-
 gdb/testsuite/gdb.multi/tids.exp              |   2 +-
 gdb/testsuite/gdb.opt/break-on-_exit.exp      |   2 +-
 .../gdb.opt/clobbered-registers-O2.exp        |   2 +-
 gdb/testsuite/gdb.opt/fortran-string.exp      |   2 +-
 gdb/testsuite/gdb.opt/solib-intra-step.exp    |   4 +-
 gdb/testsuite/gdb.pascal/types.exp            |   2 +-
 gdb/testsuite/gdb.python/lib-types.exp        |   2 +-
 .../gdb.python/pretty-print-call-by-hand.exp  |   4 +-
 gdb/testsuite/gdb.python/py-bad-printers.exp  |   2 +-
 gdb/testsuite/gdb.python/py-block.exp         |   2 +-
 gdb/testsuite/gdb.python/py-breakpoint.exp    |  28 +--
 gdb/testsuite/gdb.python/py-cmd.exp           |   2 +-
 gdb/testsuite/gdb.python/py-connection.exp    |   2 +-
 gdb/testsuite/gdb.python/py-disasm.exp        |   2 +-
 gdb/testsuite/gdb.python/py-events.exp        |   2 +-
 .../gdb.python/py-finish-breakpoint.exp       |  16 +-
 .../gdb.python/py-finish-breakpoint2.exp      |   2 +-
 gdb/testsuite/gdb.python/py-format-string.exp |   2 +-
 gdb/testsuite/gdb.python/py-frame-inline.exp  |   2 +-
 gdb/testsuite/gdb.python/py-frame.exp         |   2 +-
 .../gdb.python/py-framefilter-invalidarg.exp  |   2 +-
 gdb/testsuite/gdb.python/py-framefilter.exp   |   4 +-
 gdb/testsuite/gdb.python/py-inferior.exp      |   2 +-
 gdb/testsuite/gdb.python/py-infthread.exp     |   2 +-
 gdb/testsuite/gdb.python/py-nested-maps.exp   |   2 +-
 gdb/testsuite/gdb.python/py-objfile.exp       |   2 +-
 .../gdb.python/py-pending-frame-level.exp     |   2 +-
 gdb/testsuite/gdb.python/py-pp-maint.exp      |   2 +-
 gdb/testsuite/gdb.python/py-prettyprint.exp   |   4 +-
 gdb/testsuite/gdb.python/py-rbreak.exp        |   2 +-
 gdb/testsuite/gdb.python/py-record-btrace.exp |   2 +-
 gdb/testsuite/gdb.python/py-record-full.exp   |   2 +-
 .../gdb.python/py-recurse-unwind.exp          |   2 +-
 gdb/testsuite/gdb.python/py-shared.exp        |   2 +-
 gdb/testsuite/gdb.python/py-symbol.exp        |   6 +-
 gdb/testsuite/gdb.python/py-symtab.exp        |   2 +-
 gdb/testsuite/gdb.python/py-template.exp      |   2 +-
 gdb/testsuite/gdb.python/py-type.exp          |   2 +-
 gdb/testsuite/gdb.python/py-unwind-inline.exp |   2 +-
 gdb/testsuite/gdb.python/py-unwind-maint.exp  |   2 +-
 .../gdb.python/py-unwind-user-regs.exp        |   2 +-
 gdb/testsuite/gdb.python/py-unwind.exp        |   2 +-
 gdb/testsuite/gdb.python/py-value.exp         |   4 +-
 gdb/testsuite/gdb.python/python.exp           |   6 +-
 .../gdb.reverse/consecutive-precsave.exp      |   6 +-
 .../gdb.reverse/consecutive-reverse.exp       |   6 +-
 .../gdb.reverse/finish-reverse-bkpt.exp       |   2 +-
 gdb/testsuite/gdb.reverse/i386-precsave.exp   |   2 +-
 gdb/testsuite/gdb.reverse/i386-reverse.exp    |   2 +-
 .../gdb.reverse/i386-sse-reverse.exp          |   2 +-
 .../gdb.reverse/i387-env-reverse.exp          |   2 +-
 .../gdb.reverse/i387-stack-reverse.exp        |   2 +-
 gdb/testsuite/gdb.reverse/insn-reverse.exp    |   2 +-
 .../gdb.reverse/next-reverse-bkpt-over-sr.exp |   2 +-
 .../gdb.reverse/ppc_record_test_isa_2_06.exp  |   6 +-
 .../gdb.reverse/ppc_record_test_isa_3_1.exp   |   6 +-
 gdb/testsuite/gdb.reverse/sigall-precsave.exp |  10 +-
 gdb/testsuite/gdb.reverse/sigall-reverse.exp  |  10 +-
 .../gdb.reverse/test_ioctl_TCSETSW.exp        |   2 +-
 .../connect-with-no-symbol-file.exp           |   2 +-
 gdb/testsuite/gdb.server/ext-attach.exp       |   2 +-
 .../gdb.server/extended-remote-restart.exp    |   4 +-
 gdb/testsuite/gdb.stabs/exclfwd.exp           |   6 +-
 .../gdb.threads/clone-new-thread-event.exp    |   2 +-
 .../gdb.threads/current-lwp-dead.exp          |   2 +-
 .../gdb.threads/detach-step-over.exp          |   2 +-
 .../gdb.threads/fork-child-threads.exp        |   2 +-
 .../gdb.threads/fork-plus-threads.exp         |   2 +-
 .../gdb.threads/fork-thread-pending.exp       |   4 +-
 .../forking-threads-plus-breakpoint.exp       |   4 +-
 .../gdb.threads/gcore-stale-thread.exp        |   2 +-
 gdb/testsuite/gdb.threads/gcore-thread.exp    |   4 +-
 gdb/testsuite/gdb.threads/kill.exp            |   2 +-
 gdb/testsuite/gdb.threads/linux-dp.exp        |   2 +-
 .../gdb.threads/local-watch-wrong-thread.exp  |   2 +-
 .../multiple-successive-infcall.exp           |   2 +-
 .../next-while-other-thread-longjmps.exp      |   2 +-
 gdb/testsuite/gdb.threads/pending-step.exp    |   2 +-
 .../process-dies-while-handling-bp.exp        |   2 +-
 gdb/testsuite/gdb.threads/pthreads.exp        |  16 +-
 .../gdb.threads/reconnect-signal.exp          |   2 +-
 .../signal-command-handle-nopass.exp          |   2 +-
 ...ignal-command-multiple-signals-pending.exp |   2 +-
 .../signal-delivered-right-thread.exp         |   2 +-
 gdb/testsuite/gdb.threads/signal-sigtrap.exp  |   2 +-
 gdb/testsuite/gdb.threads/sigthread.exp       |   2 +-
 .../gdb.threads/stop-with-handle.exp          |   2 +-
 gdb/testsuite/gdb.threads/thread-find.exp     |  20 +-
 gdb/testsuite/gdb.threads/thread_check.exp    |   2 +-
 gdb/testsuite/gdb.threads/thread_events.exp   |   4 +-
 gdb/testsuite/gdb.threads/threadapply.exp     |   2 +-
 gdb/testsuite/gdb.threads/tls-nodebug-pie.exp |   2 +-
 gdb/testsuite/gdb.threads/tls-nodebug.exp     |   4 +-
 gdb/testsuite/gdb.threads/tls-shared.exp      |   2 +-
 gdb/testsuite/gdb.threads/tls-so_extern.exp   |   2 +-
 gdb/testsuite/gdb.threads/tls.exp             |   4 +-
 .../gdb.threads/vfork-follow-child-exec.exp   |   2 +-
 .../gdb.threads/vfork-follow-child-exit.exp   |   2 +-
 gdb/testsuite/gdb.threads/watchthreads.exp    |   2 +-
 gdb/testsuite/gdb.threads/watchthreads2.exp   |   2 +-
 gdb/testsuite/gdb.threads/wp-replication.exp  |   2 +-
 gdb/testsuite/gdb.trace/actions.exp           |   4 +-
 gdb/testsuite/gdb.trace/backtrace.exp         |   4 +-
 gdb/testsuite/gdb.trace/change-loc.exp        |   2 +-
 gdb/testsuite/gdb.trace/collection.exp        |   2 +-
 gdb/testsuite/gdb.trace/deltrace.exp          |   6 +-
 gdb/testsuite/gdb.trace/infotrace.exp         |   4 +-
 .../gdb.trace/mi-tracepoint-changed.exp       |   2 +-
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp    |   2 +-
 gdb/testsuite/gdb.trace/no-attach-trace.exp   |   2 +-
 gdb/testsuite/gdb.trace/packetlen.exp         |   2 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp         |   6 +-
 gdb/testsuite/gdb.trace/passcount.exp         |   4 +-
 gdb/testsuite/gdb.trace/report.exp            |   4 +-
 gdb/testsuite/gdb.trace/save-trace.exp        |   2 +-
 gdb/testsuite/gdb.trace/strace.exp            |   2 +-
 gdb/testsuite/gdb.trace/tfind.exp             |  10 +-
 gdb/testsuite/gdb.trace/tracecmd.exp          |   2 +-
 gdb/testsuite/gdb.trace/tspeed.exp            |   4 +-
 gdb/testsuite/gdb.trace/tsv.exp               |   6 +-
 gdb/testsuite/gdb.trace/unavailable.exp       |   2 +-
 gdb/testsuite/gdb.trace/while-dyn.exp         |   2 +-
 gdb/testsuite/gdb.trace/while-stepping.exp    |   2 +-
 gdb/testsuite/gdb.tui/tui-layout.exp          |   2 +-
 gdb/testsuite/gdb.xml/tdesc-reload.exp        |   4 +-
 gdb/testsuite/lib/cp-support.exp              |  64 +++---
 gdb/testsuite/lib/dwarf.exp                   |  10 +-
 gdb/testsuite/lib/gdb.exp                     |  62 +++---
 gdb/testsuite/lib/mi-support.exp              |  24 +--
 gdb/testsuite/lib/prompt.exp                  |   2 +-
 gdb/testsuite/lib/selftest-support.exp        |  12 +-
 gdb/testsuite/lib/trace-support.exp           |   6 +-
 625 files changed, 1215 insertions(+), 1215 deletions(-)


base-commit: db2e277d1a840091f56185d94f9d39c6736d2556
  

Comments

Simon Marchi Nov. 15, 2022, 3:01 p.m. UTC | #1
On 11/15/22 05:42, Andrew Burgess via Gdb-patches wrote:
> It was pointed out to me (off-list) that in this patch:
> 
>   https://sourceware.org/pipermail/gdb-patches/2022-November/193744.html
> 
> I had made use of TCL's 'then' keyword, which apparently is not the
> preferred way to write if statements these days, at least, not for
> single line conditions.  And it certainly seems that NOT using 'then'
> is more common in the GDB testsuite.
> 
> As my use of 'then' was due to copy&paste from another test, this
> series aims to prevent the same mistake happening again by removing
> all uses of 'then' for if statements where the condition fits on a
> single line.
> 
> The change was generated with sed, I sanity checked them all by eye,
> and didn't see any obvious mistakes.  Tested on x86-64 GNU/Linux and
> didn't see any test regressions.
> 
> Thoughts?

Hi Andrew,

I'm totally fine with that.

Simon
  
Tom Tromey Nov. 16, 2022, 5:20 p.m. UTC | #2
>>>>> "Andrew" == Andrew Burgess via Gdb-patches <gdb-patches@sourceware.org> writes:

Andrew> It was pointed out to me (off-list) that in this patch:
Andrew>   https://sourceware.org/pipermail/gdb-patches/2022-November/193744.html

Andrew> I had made use of TCL's 'then' keyword, which apparently is not the
Andrew> preferred way to write if statements these days, at least, not for
Andrew> single line conditions.  And it certainly seems that NOT using 'then'
Andrew> is more common in the GDB testsuite.

I always liked the "noise" keywords in Tcl, but I think it's fine to
remove the "then"s.  I'd prefer we keep "else", though, even though it
isn't strictly required.  Especially for long "if"s I think the "else"
adds some clarity.

So, ok from me.  Thank you.

Tom