diff options
| author | Janis Johnson <janosjo@codesourcery.com> | 2012-06-15 18:04:22 +0000 |
|---|---|---|
| committer | Janis Johnson <janis@gcc.gnu.org> | 2012-06-15 18:04:22 +0000 |
| commit | 165b955b34bb39d052720232a26d3f2607f6c56a (patch) | |
| tree | 98cb0ad7fd1df9dd9522c01cdac7849c931ade88 /gcc | |
| parent | 0621f7c2b92460e1c67ceee0bced99c30daa6a4d (diff) | |
| download | gcc-165b955b34bb39d052720232a26d3f2607f6c56a.zip gcc-165b955b34bb39d052720232a26d3f2607f6c56a.tar.gz gcc-165b955b34bb39d052720232a26d3f2607f6c56a.tar.bz2 | |
stackalign.exp: Combine stack alignment torture options with usual torture options.
* g++.dg/torture/stackalign/stackalign.exp: Combine stack
alignment torture options with usual torture options.
From-SVN: r188678
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp | 37 |
2 files changed, 33 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7679c27..4605b1b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2012-06-15 Janis Johnson <janosjo@codesourcery.com> + * g++.dg/torture/stackalign/stackalign.exp: Combine stack + alignment torture options with usual torture options. + * g++.dg/cpp0x/auto27.C: Add comments to checks for multiple messages reported for one line of source code. * g++.dg/cpp0x/constexpr-decl.C: Likewise. diff --git a/gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp b/gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp index 3d0609f..b02f299 100644 --- a/gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp +++ b/gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp @@ -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 |