From 91a5b3943e8999959d65206ae75ae63d488ffa43 Mon Sep 17 00:00:00 2001 From: Janis Johnson Date: Thu, 15 May 2008 16:59:21 +0000 Subject: libgomp.exp: Load torture-options.exp from gcc lib. libgomp: * testsuite/lib/libgomp.exp: Load torture-options.exp from gcc lib. gcc/doc: * doc/sourcebuild.texi: Document support for torture tests. gcc/testsuite: * lib/torture-options.exp: New support for torture options. * lib/gfortran-dg.exp (gfortran-dg-runtest): Use new torture procs. * lib/c-torture.exp: Define C_TORTURE_OPTIONS instead of TORTURE_OPTIONS; don't define torture_with_loops and torture_without_loops. * lib/gcc-dg.exp: Define DG_TORTURE_OPTIONS instead of TORTURE_OPTIONS; don't define torture_with_loops and torture_without_loops. (gcc-dg-runtest): Use new torture procs if no torture options defined. * lib/fortran-torture.exp: Define FORTRAN_TORTURE_OPTIONS instead of TORTURE_OPTIONS. (fortran-torture-execute): Use torture_with_loops instead of TORTURE_OPTIONS. (fortran-torture): Ditto. * lib/objc-torture.exp: Define OBJC_TORTURE_OPTIONS instead of TORTURE_OPTIONS; don't define torture_with_loops and torture_without_loops. * gcc.c-torture/execute/execute.exp: Use new torture procs. * gcc.c-torture/execute/builtins/builtins.exp: Ditto. * gcc.c-torture/execute/ieee/ieee.exp: Ditto. * gcc.c-torture/unsorted/unsorted.exp: Ditto. * gfortran.fortran-torture/execute/execute.exp: Ditto. * gfortran.fortran-torture/compile/compile.exp: Ditto. * gcc.target/x86_64/abi/abi-x86_64.exp: Ditto. * gcc.target/i386/math-torture/math-torture.exp: Define MATH_TORTURE_OPTIONS, use new torture procs. * gcc.dg/pch/pch.exp: Use new torture procs. * gcc.dg/format/format.exp: Ditto. * gcc.misc-tests/i386-prefetch.exp: Ditto. * gcc.misc-tests/dectest.exp: Ditto. * objc.dg/pch/pch.exp: Ditto. * objc/execute/execute.exp: Ditto. * objc/execute/exceptions/exceptions.exp: Ditto. * objc/compile/compile.exp: Ditto. From-SVN: r135381 --- gcc/testsuite/gcc.misc-tests/dectest.exp | 8 +++++++- gcc/testsuite/gcc.misc-tests/i386-prefetch.exp | 22 +++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'gcc/testsuite/gcc.misc-tests') diff --git a/gcc/testsuite/gcc.misc-tests/dectest.exp b/gcc/testsuite/gcc.misc-tests/dectest.exp index 4522576..435276d 100644 --- a/gcc/testsuite/gcc.misc-tests/dectest.exp +++ b/gcc/testsuite/gcc.misc-tests/dectest.exp @@ -20,7 +20,7 @@ # # Contributed by Ben Elliston . -set TORTURE_OPTIONS [list {} -O1 -O2 -O3 -Os -msoft-float] +set DEC_TORTURE_OPTIONS [list {} -O1 -O2 -O3 -Os -msoft-float] proc target-specific-flags {} { set result "-frounding-math " @@ -30,6 +30,7 @@ proc target-specific-flags {} { # Load support procs (borrow these from c-torture). load_lib c-torture.exp load_lib target-supports.exp +load_lib torture-options.exp # Skip these tests for targets that don't support this extension. if { ![check_effective_target_dfp] } { @@ -516,6 +517,11 @@ if [catch {set testdir $env(DECTEST)}] { return } +torture-init +set-torture-options $DEC_TORTURE_OPTIONS + note "Using tests in $testdir" dfp-run-tests [lsort [glob -nocomplain $testdir/*.decTest]] unset testdir + +torture-finish diff --git a/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp b/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp index 2601d7e..c4c2bbc 100644 --- a/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp +++ b/gcc/testsuite/gcc.misc-tests/i386-prefetch.exp @@ -84,32 +84,24 @@ if $tracelevel then { # Load support procs. load_lib gcc-dg.exp +load_lib torture-options.exp # Initialize harness. dg-init +torture-init -# Save these. They are needed if testsuite loops over multiple ABIs -set saved_torture_with_loops $torture_with_loops -set saved_torture_without_loops $torture_without_loops - -set torture_with_loops $PREFETCH_NONE -set torture_without_loops $PREFETCH_NONE +set-torture-options $PREFETCH_NONE gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-none-*.c]] "" -set torture_with_loops $PREFETCH_SSE -set torture_without_loops $PREFETCH_SSE +set-torture-options $PREFETCH_SSE gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-sse-*.c]] "" -set torture_with_loops $PREFETCH_3DNOW -set torture_without_loops $PREFETCH_3DNOW +set-torture-options $PREFETCH_3DNOW gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-3dnow-*.c]] "" -set torture_with_loops $PREFETCH_ATHLON -set torture_without_loops $PREFETCH_ATHLON +set-torture-options $PREFETCH_ATHLON gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-athlon-*.c]] "" -set torture_with_loops $saved_torture_with_loops -set torture_without_loops $saved_torture_without_loops - +torture-finish dg-finish -- cgit v1.1