From patchwork Fri Feb 23 20:18:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 26041 Received: (qmail 21240 invoked by alias); 23 Feb 2018 20:23:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 21226 invoked by uid 89); 23 Feb 2018 20:23:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: 9pmail.ess.barracuda.com Received: from 9pmail.ess.barracuda.com (HELO 9pmail.ess.barracuda.com) (64.235.150.225) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Feb 2018 20:23:17 +0000 Received: from MIPSMAIL01.mipstec.com (mailrelay.mips.com [12.201.5.28]) by mx1.ess.sfj.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Fri, 23 Feb 2018 20:23:13 +0000 Received: from [10.20.78.76] (10.20.78.76) by mips01.mipstec.com (10.20.43.31) with Microsoft SMTP Server id 14.3.361.1; Fri, 23 Feb 2018 12:18:14 -0800 Date: Fri, 23 Feb 2018 20:18:03 +0000 From: "Maciej W. Rozycki" To: Subject: [committed] GDB/testsuite: Fix a typo in $actual_line Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-BESS-ID: 1519417391-298552-8944-68714-10 X-BESS-VER: 2018.2-r1802222008 X-BESS-Apparent-Source-IP: 12.201.5.28 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.190356 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 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. --- Hi, 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 investigate. Committed as obvious. Maciej --- gdb/testsuite/lib/cp-support.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) gdb-test-ptype-class-actual-line.diff 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