From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82963 invoked by alias); 19 Apr 2016 11:35:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 82847 invoked by uid 89); 19 Apr 2016 11:35:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 spammy=Middle X-HELO: mail-pf0-f181.google.com Received: from mail-pf0-f181.google.com (HELO mail-pf0-f181.google.com) (209.85.192.181) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 19 Apr 2016 11:34:54 +0000 Received: by mail-pf0-f181.google.com with SMTP id e128so6076459pfe.3 for ; Tue, 19 Apr 2016 04:34:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=uajmB1k1MJfGiF4OFqj8QW4Cj8KFjTCu9lQnVHMyXRk=; b=jZ7mEtcw3Kq8AdTJuZuV6zwWCZF8mh0tVxUqvovJ59/mMvNZYgVcTDycgDsxj9pyTB xhGJ60CKmWAth07DPBr+aRJXRqUOo1ohRKakNM+WyUsi+F1pcvUx2gOgEMLVo6FvlpQa 7lwvMHf0DwvOWU2gNNeFxBpAWDuhVTEav1TecGQFuN/5MiHv56St3Xe0G1xahvO+rUDS q0cHzuynbC/+daurz26q8ncmcObc5ec0Ht4R9aoIZEi2W9sDwpj26E1BmH2wFvYgegbL kjgMo/QHT8n6X9un/lcW1Dj5Lbbq7H4GNC2Y7/Nz1FDrBzL906Ett7gtiCZN828UcrQ7 sjOA== X-Gm-Message-State: AOPr4FWQWkFOE8GgJd+ROWHvkYWDceT04zwbkWJObz6ljSE6MUOiefMrbU1UFwhH3gZR5g== X-Received: by 10.98.69.1 with SMTP id s1mr3347603pfa.56.1461065692212; Tue, 19 Apr 2016 04:34:52 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id to9sm90662867pab.27.2016.04.19.04.34.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 04:34:51 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH] Fix fails in gdb.trace/unavailable.exp Date: Tue, 19 Apr 2016 11:35:00 -0000 Message-Id: <1461065672-16391-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2016-04/txt/msg00436.txt.bz2 I am seeing some test fails in gdb.trace/unavailable.exp on aarch64-linux, like this, print derived_whole^M $43 = (Derived) { = { = {x = 2}, _vptr.Middle = 0x401860 , y = 3}, _vptr.Derived = 0x401848 , z = 4}^M (gdb) FAIL: gdb.trace/unavailable.exp: collect globals: print object on: print derived_whole print derived_whole^M $47 = { = { = {x = 2}, _vptr.Middle = 0x401860 , y = 3}, _vptr.Derived = 0x401848 , z = 4}^M (gdb) FAIL: gdb.trace/unavailable.exp: collect globals: print object off: print derived_whole these fails are also found by recent x86_64-linux buildbot, https://sourceware.org/ml/gdb-testers/2016-q2/msg00622.html The fix is exactly the same as this one http://www.sourceware.org/ml/gdb-patches/2015-10/msg00252.html (the extra "VTT" after hex), in which we match extra things after $hex. gdb/testsuite: 2016-04-19 Yao Qi * gdb.trace/unavailable.exp (gdb_collect_globals_test_1): Match more after $hex. --- gdb/testsuite/gdb.trace/unavailable.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index 343ac64..ed1b533 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -613,7 +613,7 @@ proc gdb_collect_globals_test_1 { } { # whole object available gdb_test "print derived_whole" \ - " = \\(Derived\\) { = { = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex , z = 4}" + " = \\(Derived\\) { = { = {x = 2}, _vptr.Middle = ${hex}( <\[^>]*>)?, y = 3}, _vptr.Derived = $hex , z = 4}" } gdb_test_no_output "set print object off" @@ -631,7 +631,7 @@ proc gdb_collect_globals_test_1 { } { # whole object available gdb_test "print derived_whole" \ - " = { = { = {x = 2}, _vptr.Middle = $hex, y = 3}, _vptr.Derived = $hex , z = 4}" + " = { = { = {x = 2}, _vptr.Middle = ${hex}( <\[^>]*>)?, y = 3}, _vptr.Derived = $hex , z = 4}" } # An instance of a virtual class where we collected everything but -- 1.9.1