diff options
Diffstat (limited to 'gcc/testsuite/lib')
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 8 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc.exp | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/obj-c++-dg.exp | 165 | ||||
| -rw-r--r-- | gcc/testsuite/lib/obj-c++.exp | 311 | ||||
| -rw-r--r-- | gcc/testsuite/lib/scanasm.exp | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/scantree.exp | 45 |
6 files changed, 539 insertions, 3 deletions
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 518e836020c..48226db72a9 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -299,12 +299,20 @@ proc g++_target_compile { source dest type options } { } lappend options "additional_flags=[libio_include_flags]" + # APPLE LOCAL begin testsuite multiply defined + if [ istarget *-*-darwin* ] { + lappend options "ldflags=-Wl,-multiply_defined,suppress" + } + # APPLE LOCAL end testsuite multiply defined lappend options "compiler=$GXX_UNDER_TEST"; set options [concat $gpp_compile_options $options] set options [concat "$ALWAYS_CXXFLAGS" $options]; + # APPLE LOCAL long double warning + lappend options "additional_flags=-Wno-long-double" + if { [regexp "(^| )-frepo( |$)" $options] && \ [regexp "\.o(|bj)$" $dest] } then { regsub "\.o(|bj)$" $dest ".rpo" rponame diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp index ac4dc35e8e9..a27b3583d90 100644 --- a/gcc/testsuite/lib/gcc.exp +++ b/gcc/testsuite/lib/gcc.exp @@ -143,7 +143,7 @@ proc gcc_target_compile { source dest type options } { if [target_info exists gcc,no_trampolines] { lappend options "additional_flags=-DNO_TRAMPOLINES" } - if [target_info exists gcc,no_label_values] { + if { 1 } { lappend options "additional_flags=-DNO_LABEL_VALUES" } # TOOL_OPTIONS must come first, so that it doesn't override testcase @@ -154,6 +154,11 @@ proc gcc_target_compile { source dest type options } { if [target_info exists gcc,timeout] { lappend options "timeout=[target_info gcc,timeout]" } + # APPLE LOCAL begin testsuite multiply defined + if [ istarget *-*-darwin* ] { + lappend options "ldflags=-Wl,-multiply_defined,suppress" + } + # APPLE LOCAL end testsuite multiply defined lappend options "compiler=$GCC_UNDER_TEST" set options [dg-additional-files-options $options $source] return [target_compile $source $dest $type $options] diff --git a/gcc/testsuite/lib/obj-c++-dg.exp b/gcc/testsuite/lib/obj-c++-dg.exp new file mode 100644 index 00000000000..90e4a37a940 --- /dev/null +++ b/gcc/testsuite/lib/obj-c++-dg.exp @@ -0,0 +1,165 @@ +# APPLE LOCAL file Objective-C++ +# Copyright (C) 2002 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. + +load_lib dg.exp +load_lib file-format.exp +load_lib target-supports.exp +load_lib scanasm.exp + +# For prune_gcc_output. +load_lib gcc.exp + +if ![info exists TORTURE_OPTIONS] { + # It is theoretically beneficial to group all of the O2/O3 options together, + # as in many cases the compiler will generate identical executables for + # all of them--and the c-torture testsuite will skip testing identical + # executables multiple times. + # Also note that -finline-functions is explicitly included in one of the + # items below, even though -O3 is also specified, because some ports may + # choose to disable inlining functions by default, even when optimizing. + set TORTURE_OPTIONS [list \ + { -O0 } \ + { -O1 } \ + { -O2 } \ + { -O3 -fomit-frame-pointer } \ + { -O3 -fomit-frame-pointer -funroll-loops } \ + { -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions } \ + { -O3 -g } \ + { -Os } ] +} + + +# Split TORTURE_OPTIONS into two choices: one for testcases with loops and +# one for testcases without loops. + +set torture_with_loops $TORTURE_OPTIONS +set torture_without_loops "" +foreach option $TORTURE_OPTIONS { + if ![string match "*loop*" $option] { + lappend torture_without_loops $option + } +} + +# Define gcc callbacks for dg.exp. + +proc obj-c++-dg-test { prog do_what extra_tool_flags } { + # Set up the compiler flags, based on what we're going to do. + + switch $do_what { + "preprocess" { + set compile_type "preprocess" + set output_file "[file rootname [file tail $prog]].i" + } + "compile" { + set compile_type "assembly" + set output_file "[file rootname [file tail $prog]].s" + } + "assemble" { + set compile_type "object" + set output_file "[file rootname [file tail $prog]].o" + } + "link" { + set compile_type "executable" + set output_file "[file rootname [file tail $prog]].exe" + # The following line is needed for targets like the i960 where + # the default output file is b.out. Sigh. + } + "run" { + set compile_type "executable" + # FIXME: "./" is to cope with "." not being in $PATH. + # Should this be handled elsewhere? + # YES. + set output_file "./[file rootname [file tail $prog]].exe" + # This is the only place where we care if an executable was + # created or not. If it was, dg.exp will try to run it. + remote_file build delete $output_file; + } + default { + perror "$do_what: not a valid dg-do keyword" + return "" + } + } + set options "" + if { $extra_tool_flags != "" } { + lappend options "additional_flags=$extra_tool_flags" + } + + set comp_output [obj-c++_target_compile "$prog" "$output_file" "$compile_type" $options]; + + return [list $comp_output $output_file] +} + +proc obj-c++-dg-prune { system text } { + set text [prune_gcc_output $text] + + # If we see "region xxx is full" then the testcase is too big for ram. + # This is tricky to deal with in a large testsuite like c-torture so + # deal with it here. Just mark the testcase as unsupported. + if [regexp "(^|\n)\[^\n\]*: region \[^\n\]* is full" $text] { + # The format here is important. See dg.exp. + return "::unsupported::memory full" + } + + return $text +} + +# Utility routines. + +# +# search_for -- looks for a string match in a file +# +proc search_for { file pattern } { + set fd [open $file r] + while { [gets $fd cur_line]>=0 } { + if [string match "*$pattern*" $cur_line] then { + close $fd + return 1 + } + } + close $fd + return 0 +} + +# Modified dg-runtest that can cycle through a list of optimization options +# as c-torture does. +proc obj-c++-dg-runtest { testcases default-extra-flags } { + global runtests + + foreach test $testcases { + # If we're only testing specific files and this isn't one of + # them, skip it. + if ![runtest_file_p $runtests $test] { + continue + } + + # Look for a loop within the source code - if we don't find one, + # don't pass -funroll[-all]-loops. + global torture_with_loops torture_without_loops + if [expr [search_for $test "for*("]+[search_for $test "while*("]] { + set option_list $torture_with_loops + } else { + set option_list $torture_without_loops + } + + set nshort [file tail [file dirname $test]]/[file tail $test] + + foreach flags $option_list { + verbose "Testing $nshort, $flags" 1 + dg-test $test $flags ${default-extra-flags} + } + } +} diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp new file mode 100644 index 00000000000..05a84268758 --- /dev/null +++ b/gcc/testsuite/lib/obj-c++.exp @@ -0,0 +1,311 @@ +# APPLE LOCAL file Objective-C++ +# Copyright (C) 2002 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file was written by Rob Savoye (rob@cygnus.com) +# Currently maintained by Doug Evans (dje@cygnus.com) + +# This file is loaded by the tool init file (eg: unix.exp). It provides +# default definitions for objc_start, etc. and other supporting cast members. + +# These globals are used by objc_start if no compiler arguments are provided. +# They are also used by the various testsuites to define the environment: +# where to find stdio.h, libc.a, etc. + +load_lib libgloss.exp +load_lib prune.exp +load_lib gcc-defs.exp + +# We want to sponge off many G++ goodies. +load_lib g++.exp + +# +# OBJCXX_UNDER_TEST is the compiler under test. +# + +# +# default_obj-c++_version -- extract and print the version number of the compiler +# + +proc default_obj-c++_version { } { + global OBJCXX_UNDER_TEST + + obj-c++_init; + + # ignore any arguments after the command + set compiler [lindex $OBJCXX_UNDER_TEST 0] + + if ![is_remote host] { + set compiler_name [which $compiler]; + } else { + set compiler_name $compiler; + } + + # verify that the compiler exists + if { $compiler_name != 0 } then { + set tmp [remote_exec host "$compiler -v"] + set status [lindex $tmp 0]; + set output [lindex $tmp 1]; + regexp "version.*$" $output version + if { $status == 0 && [info exists version] } then { + clone_output "$compiler_name $version\n" + } else { + clone_output "Couldn't determine version of $compiler_name: $output\n" + } + } else { + # compiler does not exist (this should have already been detected) + warning "$compiler does not exist" + } +} + +# +# Call obj-c++_version. We do it this way so we can override it if needed. +# +proc obj-c++_version { } { + default_obj-c++_version; +} + +# +# obj-c++_init -- called at the start of each .exp script. +# +# There currently isn't much to do, but always using it allows us to +# make some enhancements without having to go back and rewrite the scripts. +# + +set objcxx_initialized 0 + +proc obj-c++_init { args } { + global subdir + global objcxx_initialized + global base_dir + global tmpdir + global libdir + global gluefile wrap_flags + global ALWAYS_CXXFLAGS + global GXX_UNDER_TEST + global OBJCXX_UNDER_TEST + global TOOL_EXECUTABLE + global TESTING_IN_BUILD_TREE + + if { $objcxx_initialized == 1 } { return; } + + if ![info exists GXX_UNDER_TEST] then { + if [info exists TOOL_EXECUTABLE] { + set GXX_UNDER_TEST $TOOL_EXECUTABLE; + } else { + if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { + set GXX_UNDER_TEST [transform c++] + } else { + set GXX_UNDER_TEST [findfile $base_dir/../g++ "$base_dir/../g++ -B$base_dir/../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]] + } + } + } + + set OBJCXX_UNDER_TEST "$GXX_UNDER_TEST -x objective-c++" + + if ![info exists tmpdir] then { + set tmpdir /tmp + } + if { [target_info needs_status_wrapper]!="" && ![info exists gluefile] } { + set gluefile ${tmpdir}/testglue.o; + set result [build_wrapper $gluefile]; + if { $result != "" } { + set gluefile [lindex $result 0]; + set wrap_flags [lindex $result 1]; + } else { + unset gluefile + } + } + + set ALWAYS_CXXFLAGS "" + + if ![is_remote host] { + if [info exists TOOL_OPTIONS] { + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"; + } else { + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs] ]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs] ]"; + } + } + + if [info exists TOOL_OPTIONS] { + lappend ALWAYS_CXXFLAGS "additional_flags=$TOOL_OPTIONS"; + } + + # Make sure that lines are not wrapped. That can confuse the + # error-message parsing machinery. + lappend ALWAYS_CXXFLAGS "additional_flags=-fmessage-length=0" + + verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS" + + verbose "obj-c++ is initialized" 3 +} + +proc obj-c++_target_compile { source dest type options } { + global rootme; + global tmpdir; + global gluefile wrap_flags; + global ALWAYS_CXXFLAGS + global OBJCXX_UNDER_TEST + global TOOL_OPTIONS + global ld_library_path + + lappend options "compiler=$OBJCXX_UNDER_TEST" + + #set ld_library_path ".:${rootme}" + lappend options "libs=-lstdc++" + + if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } { + lappend options "libs=${gluefile}" + lappend options "ldflags=$wrap_flags" + } + + if [target_info exists obj-c++,stack_size] { + lappend options "additional_flags=-DSTACK_SIZE=[target_info obj-c++,stack_size]" + } + if [target_info exists obj-c++,no_trampolines] { + lappend options "additional_flags=-DNO_TRAMPOLINES" + } + if [target_info exists obj-c++,no_label_values] { + lappend options "additional_flags=-DNO_LABEL_VALUES" + } + if [info exists TOOL_OPTIONS] { + lappend options "additional_flags=$TOOL_OPTIONS" + } + + set options [concat "$ALWAYS_CXXFLAGS" $options]; + + return [target_compile $source $dest $type $options] +} + +# +# obj-c++_pass -- utility to record a testcase passed +# + +proc obj-c++_pass { testcase cflags } { + if { "$cflags" == "" } { + pass "$testcase" + } else { + pass "$testcase, $cflags" + } +} + +# +# obj-c++_fail -- utility to record a testcase failed +# + +proc obj-c++_fail { testcase cflags } { + if { "$cflags" == "" } { + fail "$testcase" + } else { + fail "$testcase, $cflags" + } +} + +# +# obj-c++_finish -- called at the end of every .exp script that calls obj-c++_init +# +# The purpose of this proc is to hide all quirks of the testing environment +# from the testsuites. It also exists to undo anything that obj-c++_init did +# (that needs undoing). +# + +proc obj-c++_finish { } { + # The testing harness apparently requires this. + global errorInfo; + + if [info exists errorInfo] then { + unset errorInfo + } + + # Might as well reset these (keeps our caller from wondering whether + # s/he has to or not). + global prms_id bug_id + set prms_id 0 + set bug_id 0 +} + +proc obj-c++_exit { } { + global gluefile; + + if [info exists gluefile] { + file_on_build delete $gluefile; + unset gluefile; + } +} + +# If this is an older version of dejagnu (without runtest_file_p), +# provide one and assume the old syntax: foo1.exp bar1.c foo2.exp bar2.c. +# This can be deleted after next dejagnu release. + +if { [info procs runtest_file_p] == "" } then { + proc runtest_file_p { runtests testcase } { + if { $runtests != "" && [regexp "\[.\]\[cC\]" $runtests] } then { + if { [lsearch $runtests [file tail $testcase]] >= 0 } then { + return 1 + } else { + return 0 + } + } + return 1 + } +} + +# Provide a definition of this if missing (delete after next dejagnu release). + +if { [info procs prune_warnings] == "" } then { + proc prune_warnings { text } { + return $text + } +} + +# Utility used by mike-gcc.exp and c-torture.exp. +# Check the compiler(/assembler/linker) output for text indicating that +# the testcase should be marked as "unsupported". +# +# When dealing with a large number of tests, it's difficult to weed out the +# ones that are too big for a particular cpu (eg: 16 bit with a small amount +# of memory). There are various ways to deal with this. Here's one. +# Fortunately, all of the cases where this is likely to happen will be using +# gld so we can tell what the error text will look like. + +proc ${tool}_check_unsupported_p { output } { + if [regexp "(^|\n)\[^\n\]*: region \[^\n\]* is full" $output] { + return "memory full" + } + return "" +} + +# Prune messages from obj-c++ that aren't useful. + +proc prune_obj-c++_output { text } { + #send_user "Before:$text\n" + regsub -all "(^|\n)\[^\n\]*: In (function|method) \[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: At top level:\[^\n\]*" $text "" text + + # It would be nice to avoid passing anything to obj-c++ that would cause it to + # issue these messages (since ignoring them seems like a hack on our part), + # but that's too difficult in the general case. For example, sometimes + # you need to use -B to point obj-c++ at crt0.o, but there are some targets + # that don't have crt0.o. + regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $text "" text + regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $text "" text + + #send_user "After:$text\n" + + return $text +} diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 79d93cbf089..527813139f6 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -156,12 +156,13 @@ proc scan-assembler-dem { args } { } # Find c++filt like we find g++ in g++.exp. + # APPLE LOCAL - c++filt3 if ![info exists cxxfilt] { set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ $base_dir/../../binutils/cxxfilt \ [findfile $base_dir/../c++filt $base_dir/../c++filt \ [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]]] + [transform c++filt3]]]] verbose -log "c++filt is $cxxfilt" } @@ -202,12 +203,13 @@ proc scan-assembler-dem-not { args } { } # Find c++filt like we find g++ in g++.exp. + # APPLE LOCAL - c++filt3 if ![info exists cxxfilt] { set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \ $base_dir/../../binutils/cxxfilt \ [findfile $base_dir/../c++filt $base_dir/../c++filt \ [findfile $base_dir/c++filt $base_dir/c++filt \ - [transform c++filt]]]] + [transform c++filt3]]]] verbose -log "c++filt is $cxxfilt" } diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp index 76d1a59fb60..b53c1ba235f 100644 --- a/gcc/testsuite/lib/scantree.exp +++ b/gcc/testsuite/lib/scantree.exp @@ -19,6 +19,51 @@ # # This is largely borrowed from scanasm.exp. +# Utility for diffing compiler result against an expected output file. +# Invoked via dg-final. Call pass if there are no differences between +# the output of the compiler and the expected output file, otherwise +# fail. The expected output file has the same name as the output +# file, and is stored in the same directory as the testcase. +# +# Argument 0 is the suffix for the tree dump file +# Argument 1 handles expected failures and the like +proc diff-tree-dumps { args } { + if { [llength $args] < 1 } { + error "diff-tree-dumps: too few arguments" + return + } + if { [llength $args] > 2 } { + error "diff-tree-dumps:: too many arguments" + return + } + if { [llength $args] >= 2 } { + switch [dg-process-target [lindex $args 1]] { + "S" { } + "N" { return } + "F" { setup_xfail "*-*-*" } + "P" { } + } + } + + # This assumes that we are two frames down from dg-test, and that + # it still stores the filename of the testcase in a local variable "name". + # A cleaner solution would require a new dejagnu release. + upvar 2 prog testcase + + # This must match the rule in gcc-dg.exp. + set new_file "[glob [file tail $testcase].t??.[lindex $args 0]]" + set reference_file "[glob $testcase.[lindex $args 0]]" + + set test_result [diff $reference_file $new_file] + + if { $test_result == 1 } { + pass "$testcase diff-tree-dumps [lindex $args 0]" + } else { + fail "$testcase diff-tree-dumps [lindex $args 0]" + local_exec (diff $reference_file $new_file 0); + } +} + # Utility for scanning compiler result, invoked via dg-final. # Call pass if pattern is present, otherwise fail. # |