From patchwork Sun Apr 30 19:40:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 68566 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 301D63858425 for ; Sun, 30 Apr 2023 19:40:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id CBE513858D35 for ; Sun, 30 Apr 2023 19:40:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBE513858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id F02C2202EC for ; Sun, 30 Apr 2023 19:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1682883624; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0UMQBobKPMrfzKSRNrcp4Jseqf5+9tYoFfrM8Q7ZVU=; b=JMZrmmgHrfevisET9yGHtuK73GG8hdXUq9NO2KVUeLJY/YCBvZQOEbe8Pbw5haToYKJKQR dMqVQ65sZO1ik545uK2KLLLB6trgB3qcaFtXBj8mcMzp31IU8rNN12NAIojJA3OZ9vCMhf dwnlhlPvudh1o7pdNO+kYNc4nE+WO/Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1682883624; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f0UMQBobKPMrfzKSRNrcp4Jseqf5+9tYoFfrM8Q7ZVU=; b=XPq2FIiX4bcAcv/+PZQuJkMqcZ1EczdiEwbup1uuaazWtHJof+o9jH+BIKKnTXtLyjxVtH fu/EG5/lg4eTJWCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D345813319 for ; Sun, 30 Apr 2023 19:40:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id AOWNMijETmRQawAAMHmgww (envelope-from ) for ; Sun, 30 Apr 2023 19:40:24 +0000 Message-ID: <04283010-e7bc-5d28-9eec-4a316799c440@suse.cz> Date: Sun, 30 Apr 2023 21:40:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH (pushed)] hwasan: adjust wording in expected output in tests To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_SOFTFAIL, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" gcc/testsuite/ChangeLog: * c-c++-common/hwasan/asan-pr70541.c: Adjust wording of expected output. * c-c++-common/hwasan/heap-overflow.c: Likewise. * c-c++-common/hwasan/sanity-check-pure-c.c: Likewise. * c-c++-common/hwasan/use-after-free.c: Likewise. --- gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c | 2 +- gcc/testsuite/c-c++-common/hwasan/heap-overflow.c | 4 ++-- gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c | 4 ++-- gcc/testsuite/c-c++-common/hwasan/use-after-free.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c b/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c index ba2ed496e6e..be534dfd231 100644 --- a/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c +++ b/gcc/testsuite/c-c++-common/hwasan/asan-pr70541.c @@ -33,4 +33,4 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 4 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ -/* { dg-output "previously allocated here:" } */ +/* { dg-output "previously allocated by thread T0 here:" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c index a5a37715925..e424d8bcb12 100644 --- a/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c +++ b/gcc/testsuite/c-c++-common/hwasan/heap-overflow.c @@ -24,6 +24,6 @@ int main(int argc, char **argv) { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\].* \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "located 0 bytes after 10-byte region.*" } */ -/* { dg-output "allocated here:.*" } */ +/* { dg-output "located 0 bytes after a 10-byte region.*" } */ +/* { dg-output "allocated by thread T0 here:.*" } */ /* { dg-output "#1 0x\[0-9a-f\]+ +in _*main \[^\n\r]*heap-overflow.c:18" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c b/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c index a42921bb44c..4e557000458 100644 --- a/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c +++ b/gcc/testsuite/c-c++-common/hwasan/sanity-check-pure-c.c @@ -20,6 +20,6 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "located 5 bytes inside of 10-byte region.*" } */ +/* { dg-output "located 5 bytes inside a 10-byte region.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ -/* { dg-output "previously allocated here:" } */ +/* { dg-output "previously allocated by thread T0 here:" } */ diff --git a/gcc/testsuite/c-c++-common/hwasan/use-after-free.c b/gcc/testsuite/c-c++-common/hwasan/use-after-free.c index 41a356999aa..b058982935f 100644 --- a/gcc/testsuite/c-c++-common/hwasan/use-after-free.c +++ b/gcc/testsuite/c-c++-common/hwasan/use-after-free.c @@ -21,8 +21,8 @@ int main() { /* { dg-output "HWAddressSanitizer: tag-mismatch on address 0x\[0-9a-f\]*.*" } */ /* { dg-output "READ of size 1 at 0x\[0-9a-f\]* tags: \[\[:xdigit:\]\]\[\[:xdigit:\]\]/\[\[:xdigit:\]\]\[\[:xdigit:\]\] \\(ptr/mem\\) in thread T0.*" } */ -/* { dg-output "is located 5 bytes inside of 10-byte region.*" } */ +/* { dg-output "is located 5 bytes inside a 10-byte region.*" } */ /* { dg-output "freed by thread T0 here:.*" } */ /* { dg-output "#1\[^\n\r]*main\[^\n\r]*use-after-free.c:17.*" } */ -/* { dg-output "previously allocated here:.*" } */ +/* { dg-output "previously allocated by thread T0 here:.*" } */ /* { dg-output "#1\[^\n\r]*main\[^\n\r]*use-after-free.c:16" } */