From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by sourceware.org (Postfix) with ESMTPS id 184883AAA0E2 for ; Thu, 4 Feb 2021 08:11:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 184883AAA0E2 IronPort-SDR: 3yUw2v3DZhAYT4v48eAEbttt71r1By6veMo/SGAVIn8Pgf31llgQcC83OQvAVs9u6lB0AyqR6l lBeVH2AMY91w== X-IronPort-AV: E=McAfee;i="6000,8403,9884"; a="160951887" X-IronPort-AV: E=Sophos;i="5.79,400,1602572400"; d="scan'208";a="160951887" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 00:11:55 -0800 IronPort-SDR: KnFqp9/avKNTCGSctRgW1HHbo/SnjxriFjuIbPnrKGTlMn7d83xK3gG+UWvwjy6ihkqiOvqfMZ w/eckGC4TdgA== X-IronPort-AV: E=Sophos;i="5.79,400,1602572400"; d="scan'208";a="433825746" Received: from labpc2407.iul.intel.com (HELO localhost) ([172.28.50.61]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 00:11:54 -0800 From: Markus Metzger To: gdb-patches@sourceware.org Subject: [PATCH 7/8] testsuite, gdb.btrace: adjust expected source line in non-stop.exp Date: Thu, 4 Feb 2021 09:10:36 +0100 Message-Id: <20210204081037.3712162-11-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210204081037.3712162-1-markus.t.metzger@intel.com> References: <20210204081037.3712162-1-markus.t.metzger@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 08:11:58 -0000 In gdb.btrace/non-stop.exp, we hard-code expected source lines assuming we know how they would match to the recorded trace. Despite the fact that we should really have been using an assembly source, the assumptions work pretty well. With clang-6 -m32, we found a case where the assumptions do not hold. Adjust the expected source lines a little bit to cover that case, as well. Should we run into more cases like this, we will have to switch to an assembly source file. gdb/testsuite/ChangeLog: 2020-12-17 Markus Metzger * gdb.btrace/non-stop.exp: Adjust expected source lines. --- gdb/testsuite/gdb.btrace/non-stop.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp index 40cced7a8bb..e509d65d660 100644 --- a/gdb/testsuite/gdb.btrace/non-stop.exp +++ b/gdb/testsuite/gdb.btrace/non-stop.exp @@ -111,10 +111,10 @@ gdb_test "thread apply all info rec" ".*" gdb_test "info threads" ".*" with_test_prefix "navigate" { - gdb_test "thread apply 1 record goto 2" "$loop_line" + gdb_test "thread apply 1 record goto 3" "$loop_line" gdb_test "thread apply 2 record goto 4" "$loop_line" gdb_test "thread apply 1 info record" \ - ".*Replay in progress\. At instruction 2\." "thread 1 at insn 2" + ".*Replay in progress\. At instruction 3\." "thread 1 at insn 3" gdb_test "thread apply 2 info record" \ ".*Replay in progress\. At instruction 4\." "thread 2 at insn 4" -- 2.26.2 Intel Deutschland GmbH Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Gary Kershaw Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928