[gdb/testsuite, tclint] Fix lib/cp-support.exp

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index 088243e4594ea2d06b7b3bbaeeeb2a3d9a043fb3..d177891e476afa039b6665fdb9180c3b56b19ca0 100644 (file)
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -35,7 +35,6 @@ exclude = [
 "gdb/testsuite/config",
 "gdb/testsuite/lib/aarch64.exp",
 "gdb/testsuite/lib/aarch64-scalable.exp",
-"gdb/testsuite/lib/cp-support.exp",
 "gdb/testsuite/lib/dwarf.exp",
 "gdb/testsuite/lib/future.exp",
 "gdb/testsuite/lib/gdb.exp",

diff --git a/gdb/testsuite/lib/cp-support.exp b/gdb/testsuite/lib/cp-support.exp
index 40351c65bfe14486d3f829bf54f0f728a8b1b0a7..ded4cf8aeb6be2ae6d0f063382548cac0b751b81 100644 (file)
--- a/gdb/testsuite/lib/cp-support.exp
+++ b/gdb/testsuite/lib/cp-support.exp
@@ -41,7 +41,8 @@ set ::debug_cp_test_ptype_class false
 proc cp_check_errata { expected_string actual_string errata_table } {
     foreach erratum $errata_table {
        if { "$expected_string" == [lindex $erratum 0]
-       &&   "$actual_string"   == [lindex $erratum 1] } then {
+            && "$actual_string" == [lindex $erratum 1] } {
+           # tclint-disable-next-line command-args
            eval [lindex $erratum 2]
        }
     }
@@ -156,7 +157,7 @@ namespace eval ::cp_support_internal {
 # format of the errata table.  Note: the errata entries are not subject to
 # demangler syntax adjustment, so you have to make a bigger table
 # with lines for each output variation.
-# 
+#
 # IN_PTYPE_ARG are arguments to pass to ptype.  The default is "/r".
 #
 # RECURSIVE_QID is used internally to call this procedure recursively
@@ -231,7 +232,7 @@ namespace eval ::cp_support_internal {
 #   gcc 3.4.1 -gstabs+
 #   gcc HEAD 20040731 -gdwarf-2
 #   gcc HEAD 20040731 -gstabs+
-# 
+#
 # TODO
 #
 # Tagless structs.
@@ -705,7 +706,7 @@ proc cp_test_ptype_class { in_exp in_testname in_key in_tag in_class_table
 
                # Update the count in list_synth.
 
-               incr synth_count 
+               incr synth_count
                set synth [list $synth_count $synth_access "$synth_re"]
                set list_synth [lreplace $list_synth $isynth $isynth $synth]