[committed] GDB/testsuite: Fix a typo in $actual_line

Message ID alpine.DEB.2.00.1802210058570.3553@tp.orcam.me.uk
State New
Headers show
  • [committed] GDB/testsuite: Fix a typo in $actual_line
Related show

Commit Message

Maciej W. Rozycki Feb. 23, 2018, 8:18 p.m.
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.

	* lib/cp-support.exp (cp_test_ptype_class): Fix a typo in the
	name of a variable: $actual_linejj -> $actual_line.

 Observed in native `mips-linux' testing, in a failure execution path that 
is not usually taken, with `gdb.cp/nested-types.exp' which is new in the 
commit referred.  Specifically with this change applied:

FAIL: gdb.cp/nested-types.exp: ptype S10 (limit = -1) // wrong nested type enum definition: enum S10::E10 {S10::A10, S10::B10, S10::C10};

happens at the place of the ERROR quoted and then there are other 8 FAIL 
test results further on.  But these failures are an unrelated issue to 

 Committed as obvious.

 gdb/testsuite/lib/cp-support.exp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



Index: binutils/gdb/testsuite/lib/cp-support.exp
--- binutils.orig/gdb/testsuite/lib/cp-support.exp	2018-02-20 19:48:02.000000000 +0000
+++ binutils/gdb/testsuite/lib/cp-support.exp	2018-02-21 13:58:43.386117243 +0000
@@ -575,7 +575,7 @@  proc cp_test_ptype_class { in_exp in_tes
 			"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