Running tests with multiple options

["Joseph S. Myers" <jsm28 at cam dot ac dot uk>]

I want to move the format checking testcases to a subdirectory
(gcc.dg/format), and run them both with and without -DWIDE, in preparation
for later implementing checking of wide format functions (most of the
tests applying to both, given suitable macro definitions).  It seems
natural to create a format.exp file in this subdirectory, with the
contents below, based on the existing files.  However, while this works if
run as "make check-gcc RUNTESTFLAGS='format.exp='", running through plain
"make check-gcc" causes the standard TORTURE_OPTIONS running through
multiple optimization levels to be used, and -DWIDE to be ignored.  Could
someone who understands Dejagnu give a suitable format.exp that works in
both cases?

#   Copyright (C) 1997, 2000 Free Software Foundation, Inc.

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

# Please email any bugs, comments, and/or additions to this file to:
# bug-gcc@prep.ai.mit.edu

# Don't run this directory with any default CFLAGS, but run tests with
# and without -DWIDE.

set TORTURE_OPTIONS [list { } { -DWIDE } ]

load_lib gcc-dg.exp

dg-init
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] ""
dg-finish


-- 
Joseph S. Myers
jsm28@cam.ac.uk