From patchwork Fri Jun 15 18:06:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 165211 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 A6CC6B70A3 for ; Sat, 16 Jun 2012 04:06:54 +1000 (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=1340388416; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=ND5IMdh4C/y2FjN19sq1+9JtMdA=; b=vec9KW3o9vgi6AB jPlcZ5o+gOujw1uz93KT8e/jUWSuu74/mgaGEap+t+C0VZiKfydyOgdQwJ4rMcK2 d5tbr8aeQke20ntlXSUbbpC5ZZib3I25FBoh3HrZJuBpZrVA9uWb2ypCtb1Z1Kpq KR42zU++YyEGMgl5L4BSCiZpXg3M= 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:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=X5FFFx0acDHbQg88GB+l5LTzCCtQg/ILDjQIlwMBG6e6v8GXSOP6g2xKKj3ErX lsx8i4PUuvNzPd4S1ZPPaoTr0K/pm+FjUFskBgyh7+v+ptxuColsQB8arjMi4uPv elm74QSwiag3A3m5xEBo/Fvmen/IXejJLOVc4fh5aDkkA=; Received: (qmail 5999 invoked by alias); 15 Jun 2012 18:06:51 -0000 Received: (qmail 5985 invoked by uid 22791); 15 Jun 2012 18:06:49 -0000 X-SWARE-Spam-Status: No, hits=-3.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 15 Jun 2012 18:06:36 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Sfauq-0000ld-6O from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Fri, 15 Jun 2012 11:06:36 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 15 Jun 2012 11:06:35 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.1.289.1; Fri, 15 Jun 2012 11:06:35 -0700 Message-ID: <4FDB79C0.6000007@mentor.com> Date: Fri, 15 Jun 2012 11:06:56 -0700 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] g++.dg/torture/stackalign: make compile lines unique in test summary 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 Like the C stackalign tests, the tests in g++.dg/torture/stackalign use two sets of torture options: the usual optimization sets used as default for torture tests, and sets of options that are specific to stack alignment. There are fewer stack alignment options used for the G++ tests but otherwise the setup is the same. This patch is similar to the one for the C stackalign tests and uses existing support to combine the torture options and stackalign options so they are all reported in the pass/fail lines in the test summary to make each line unique. Since this isn't significantly different from the patch for C tests I'm not waiting for a review. Tested on i686-pc-linux-gnu and arm-none-eabi, checked in. Janis 2012-06-15 Janis Johnson * g++.dg/torture/stackalign/stackalign.exp: Combine stack alignment torture options with usual torture options. Index: g++.dg/torture/stackalign/stackalign.exp =================================================================== --- g++.dg/torture/stackalign/stackalign.exp (revision 188540) +++ g++.dg/torture/stackalign/stackalign.exp (working copy) @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2010 +# Copyright (C) 2008, 2010, 2012 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -18,18 +18,41 @@ # This harness is for tests that should be run at all optimisation levels. load_lib g++-dg.exp +load_lib torture-options.exp + +global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS + dg-init -set additional_flags "" +torture-init +# default_flags are replaced by a dg-options test directive, or appended +# to by using dg-additional-options. Use default_flags for options that +# are used in all of the torture sets to limit the amount of noise in +# test summaries. +set default_flags "" + +# torture_flags are combined with other torture options and do not +# affect options specified within a test. +set torture_flags "" + +set stackalign_options [list] + # If automatic stack alignment is supported, force it on. if { [check_effective_target_automatic_stack_alignment] } then { - lappend additional_flags "-mstackrealign" - lappend additional_flags "-mpreferred-stack-boundary=5" + append default_flags " -mstackrealign" + append default_flags " -mpreferred-stack-boundary=5" } +lappend stackalign_options [join $torture_flags] -gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] $additional_flags if { [check_effective_target_fpic] } then { - lappend additional_flags "-fpic" - gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] $additional_flags + lappend torture_flags "-fpic" + lappend stackalign_options [join $torture_flags] } + +# Combine stackalign options with the usual torture optimization flags. +set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] $stackalign_options + +gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "$default_flags" + +torture-finish dg-finish