From 11b031457e89d5739922ddd0bc65c9d781b6db35 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 23 Feb 2018 20:14:41 +0000 Subject: [PATCH 1/1] GDB/testsuite: Fix a typo in $actual_line Fix a commit 883fd55ab104 ("Record nested types") issue: ERROR: tcl error sourcing .../gdb/testsuite/gdb.cp/nested-types.exp. ERROR: can't read "actual_linejj": no such variable while executing "append txt " definition: $actual_linejj"" (procedure "cp_test_ptype_class" line 324) invoked from within "cp_test_ptype_class $name "ptype $name (limit = $limit)" $key $name $children" (procedure "test_nested_limit" line 28) invoked from within "test_nested_limit -1 false" (file ".../gdb/testsuite/gdb.cp/nested-types.exp" line 310) invoked from within "source .../gdb/testsuite/gdb.cp/nested-types.exp" ("uplevel" body line 1) invoked from within "uplevel #0 source .../gdb/testsuite/gdb.cp/nested-types.exp" invoked from within "catch "uplevel #0 source $test_file_name"" testcase .../gdb/testsuite/gdb.cp/nested-types.exp completed in 9 seconds caused by $actual_line having been accidentally referred to as $actual_linejj in one place. gdb/testsuite/ * lib/cp-support.exp (cp_test_ptype_class): Fix a typo in the name of a variable: $actual_linejj -> $actual_line. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/cp-support.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7ee3e0b835c..e1bd8df4241 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-23 Maciej W. Rozycki + + * lib/cp-support.exp (cp_test_ptype_class): Fix a typo in the + name of a variable: $actual_linejj -> $actual_line. + 2018-02-21 John Baldwin * gdb.arch/amd64-i386-address.exp: Fix a typo. diff --git a/gdb/testsuite/lib/cp-support.exp b/gdb/testsuite/lib/cp-support.exp index de36cd8ba47..66b58d5f60c 100644 --- a/gdb/testsuite/lib/cp-support.exp +++ b/gdb/testsuite/lib/cp-support.exp @@ -575,7 +575,7 @@ proc cp_test_ptype_class { in_exp in_testname in_key in_tag in_class_table "Expecting enum result: $expected_result" if {![regexp -- $expected_result $actual_line]} { set txt "$in_testname // wrong nested type enum" - append txt " definition: $actual_linejj" + append txt " definition: $actual_line" fail $txt queue delete $line_queue return false -- 2.30.2