From patchwork Mon Dec 10 12:22:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 204861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 63B462C00FE for ; Mon, 10 Dec 2012 23:22:38 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1355746959; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Subject:Message-ID:Reply-To: MIME-Version:Content-Type:Content-Disposition:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=yrLorWv7qJvmvu/8QrD8 XRzQK9A=; b=PbLv89AiS0pfNR6AArs/z6LT4d+o7ZhNHLtv4nSWN9OhnRyOe5RV ntGC3usLVGKtQsWD72XvwZQT+qSMwBi8V+OANpsDsKp7o6EwRmJf4axjGpzTVNs9 yKf7qU9GIqgzqx7llYG1Nc7KRcvzA79JnNqYZJ23p1n+2ng0zldUwso= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=ufupIXLYmjBnEZsOqhg0bzkkTCdkTPvjPg+/G3nV+2aExHf6FgdrGvFWaC3uPe VulXGg8kf5nbKd968q2FTJIDa7VrqfeNcJaIQ5bL7+Iz97XAhbRQmiLtPJ6JZS/v vn9cSc8y3/6v1ZC3DzOjTJxIGsz9N1ogGX8bb/wsOKe0A=; Received: (qmail 31167 invoked by alias); 10 Dec 2012 12:22:32 -0000 Received: (qmail 31156 invoked by uid 22791); 10 Dec 2012 12:22:31 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 10 Dec 2012 12:22:25 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBACMPQd017426 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 10 Dec 2012 07:22:25 -0500 Received: from zalov.redhat.com (vpn1-7-17.ams2.redhat.com [10.36.7.17]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBACMMZE031137 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 10 Dec 2012 07:22:24 -0500 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.redhat.com (8.14.5/8.14.5) with ESMTP id qBACMLXe002459 for ; Mon, 10 Dec 2012 13:22:22 +0100 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id qBACMLwj002458 for gcc-patches@gcc.gnu.org; Mon, 10 Dec 2012 13:22:21 +0100 Date: Mon, 10 Dec 2012 13:22:21 +0100 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [asan, committed] Sync asan_test.cc from upstream Message-ID: <20121210122221.GH2315@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi! I've committed as obvious this change to sync the test from upstream to avoid one unnecessary FAIL. 2012-12-10 Jakub Jelinek * g++.dg/asan/asan_test.cc: Sync from upstream. * g++.dg/asan/asan_test_utils.h: Likewise. Jakub --- gcc/testsuite/g++.dg/asan/asan_test.cc 2012-12-03 12:44:13.828811869 +0100 +++ gcc/testsuite/g++.dg/asan/asan_test.cc 2012-12-05 19:06:52.288213731 +0100 @@ -1604,7 +1606,7 @@ NOINLINE static int LargeFunction(bool d TEST(AddressSanitizer, DISABLED_LargeFunctionSymbolizeTest) { int failing_line = LargeFunction(false); char expected_warning[128]; - sprintf(expected_warning, "LargeFunction.*asan_test.cc:%d", failing_line); + sprintf(expected_warning, "LargeFunction.*asan_test.*:%d", failing_line); EXPECT_DEATH(LargeFunction(true), expected_warning); } @@ -1748,7 +1750,7 @@ TEST(AddressSanitizer, FileNameInGlobalR static char zoo[10]; const char *p = Ident(zoo); // The file name should be present in the report. - EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test.cc"); + EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test."); } int *ReturnsPointerToALocalObject() { --- gcc/testsuite/g++.dg/asan/asan_test_utils.h 2012-12-03 12:44:48.868608115 +0100 +++ gcc/testsuite/g++.dg/asan/asan_test_utils.h 2012-12-05 19:06:52.308213631 +0100 @@ -53,7 +55,7 @@ typedef __int64 int64_t; // Make the compiler thinks that something is going on there. inline void break_optimization(void *arg) { - __asm__ __volatile__ ("" : : "r" (arg) : "memory"); + __asm__ __volatile__("" : : "r" (arg) : "memory"); } // This function returns its parameter but in such a way that compiler