From patchwork Tue Feb 13 06:40:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuriy Kolerov X-Patchwork-Id: 85646 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2A1733858403 for ; Tue, 13 Feb 2024 06:41:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id E61D83858D20 for ; Tue, 13 Feb 2024 06:40:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E61D83858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E61D83858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707806445; cv=none; b=uJHt9cUXi1/W2vc8M5urFO7PkDXuuRgk/D+zEVBpwZgKzZ4W/HxJMn2gALm9b/XaW5oEBOlyGxGLxwmKf4Rh1lDTmqZ4J3X5MCXQqDwstl/r/egbP4GiHJ2SVeFtF7rcc5vsPnYHUgLI65DCjTI/9KVl53nTFd88teA+vmyAMfk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707806445; c=relaxed/simple; bh=xfV941YOtGEy6WYHWwVe3c9ev9JsfURPCx8vjh4qmXU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Z8Pn4h86AENAoVcNdm4HC9ksJ2yDamsKHWXTEqw5YpKP+HY7l/xZcuhQwO5wXlnYFk6S1PiS5HC57QkAQ8tu6RCc2Yu3ZHlgzoIWrcT07uw+hcLszbGxzjo7CnZBtUAlUEc+1Bp/tCDzvPnQ2tLkEW2MbHgQwi2/lvUnDO1v5GI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-55fcceb5f34so4501622a12.3 for ; Mon, 12 Feb 2024 22:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707806442; x=1708411242; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NZA6q+8DsBZFs49MrADvc79TYUdhy/YmUwGjD24sNfQ=; b=EnfioYx+6gmf84FbzNBbIJJ7DmgTxCN5CxMQl1j3w47K1tE5z08GkReczL79OfFilp tA9JvgsCop6vQWo72QDMJ7gsfWwFinqZtIYAClWvUYfluM6xC1V0LSE95R1C+yWySPtB DNx0suozX2ojZr44wx+8TpvXBzs2HjCLys7o1hyxInLKSzBo+ry63r6ZB/H4e5OQYAeO vzRNdEPHkCY0ifMuHM36EzJKmPWBSGBqQzpzysQ42z2EEb36ca/YWXCCiXfMqIumniu6 rQuL4e6UjdPKMl1L8AhGJLQeBvpvWpWbmVtFuzJX70LYAKM6fd0TCSK6t/OYxfRKhCZj 7kog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707806442; x=1708411242; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NZA6q+8DsBZFs49MrADvc79TYUdhy/YmUwGjD24sNfQ=; b=AS4ksy5PbqyUpZumNSro6+OA360YJ9QdRotvWcCfaV/qtf6yaMDyMrVKcat6BZ8sO1 iMl/LbQDXbKHPKX+0oyveFnE3yZ9j+caRuFtuIP+wyFQ/c3DD5Ow5CUJU/d7LyqCKkdz dDyhZhji9A8/MmqlETq9bPsnOVz1yvo0L891JYEg/nIB5WWW8OuMS42LEQKhqXks+O3b Lm5zjbk/OQ7FKoX/8W+qitXUA0v2hsdxMduhjInJmGbg2CNP7tPhdAHjT6qtXUiYT34H b+bvcUjEuDOtt1lkwkNtNO4XY77+Chbj+Zwf0mJM8IjU7UiBwS/t7SWVbo6iTnsvdHxr 567w== X-Gm-Message-State: AOJu0YwAy+yU8it/c7r7Y6Gn6O/k8KcNoIbt29k0xlPUrTo3K77gsHiA k5sKctQLVEdR32SUPrvaepdFQEuEGQpmXTDJ62aN06yiJT5R4qlgpBcFFYLJFJGIqwIIoSo= X-Google-Smtp-Source: AGHT+IGtbi1h8bkL7yuFQ3QwdOaBFI+AI3H85T8i19NNrlQ1f1SPzJdwnU1PEQVsS544VzvnnL6VzA== X-Received: by 2002:aa7:c307:0:b0:55f:fed8:ea2f with SMTP id l7-20020aa7c307000000b0055ffed8ea2fmr5969964edq.25.1707806441867; Mon, 12 Feb 2024 22:40:41 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWP6x6A5KQ2u6xXgQGIU/HRgGfGD3xqaSslwriG5LsVLvmzI1k78SUuSOUjG/jGdDXhEATRT2bWIprk6YVT2z8dRPHW Received: from localhost.localdomain ([2a00:cc47:20b1:3000:4f99:fe1f:2a1f:1530]) by smtp.gmail.com with ESMTPSA id b8-20020a0564021f0800b005617cebd051sm2965645edb.78.2024.02.12.22.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 22:40:41 -0800 (PST) From: Yuriy Kolerov To: gdb-patches@sourceware.org, shahab@synopsys.com Cc: Yuriy Kolerov Subject: [PATCH v4] arc: Don't use multiline in arc-disassembler-options.exp test Date: Tue, 13 Feb 2024 06:40:22 +0000 Message-Id: <20240213064022.32961-1-kolerov93@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Breaking a TCL string to several lines leads to adding of extra symbols to the resulting expect string. In turn, this leads to failing of all test cases in gdb.arch/arc-disassembler-options.exp testsuite. It's necessary to use multi_line function in such cases. Signed-off-by: Yuriy Kolerov --- gdb/testsuite/gdb.arch/arc-disassembler-options.exp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp index 655edcc774b..3d2bbe83015 100644 --- a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp +++ b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp @@ -28,10 +28,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {}] \ clean_restart ${objfile} proc arc_disassemble_test { func insn mesg } { - gdb_test "disassemble $func" \ - "Dump of assembler code for function $func:\r\n\ - \[^:\]+:\t$insn\r\nEnd of assembler dump\." \ - $mesg + set pass_re [multi_line \ + "Dump of assembler code for function $func:" \ + "\[^:\]+:\t$insn" \ + "End of assembler dump\\."] + gdb_test "disassemble $func" $pass_re $mesg } # Verify defaults.