9e531d3749
This patch adds an easy way to write tests for expected multiline output. For example we can test carets and underlines for a particular diagnostic with: /* { dg-begin-multiline-output "" } typedef struct _GMutex GMutex; ^~~~~~~ { dg-end-multiline-output "" } */ multiline.exp is used by prune.exp; hence we need to load it before prune.exp via *load_gcc_lib* for the testsuites of the various non-"gcc" support libraries (e.g. boehm-gc). gcc/testsuite/ChangeLog: * lib/multiline.exp: New file. * lib/prune.exp: Load multiline.exp. (prune_gcc_output): Call into multiline.exp to handle any multiline output directives. * lib/libgo.exp: Load multiline.exp before prune.exp, using load_gcc_lib. boehm-gc/ChangeLog: * testsuite/lib/boehm-gc.exp: Load multiline.exp before prune.exp, using load_gcc_lib. libatomic/ChangeLog: * testsuite/lib/libatomic.exp: Load multiline.exp before prune.exp, using load_gcc_lib. libgomp/ChangeLog: * testsuite/lib/libgomp.exp: Load multiline.exp before prune.exp, using load_gcc_lib. libitm/ChangeLog: * testsuite/lib/libitm.exp: Load multiline.exp before prune.exp, using load_gcc_lib. libvtv/ChangeLog: * testsuite/lib/libvtv.exp: Load multiline.exp before prune.exp, using load_gcc_lib. From-SVN: r228655
236 lines
6.5 KiB
Plaintext
236 lines
6.5 KiB
Plaintext
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||
|
||
# Damn dejagnu for not having proper library search paths for load_lib.
|
||
# We have to explicitly load everything that gcc-dg.exp wants to load.
|
||
|
||
proc load_gcc_lib { filename } {
|
||
global srcdir loaded_libs
|
||
|
||
load_file $srcdir/../../gcc/testsuite/lib/$filename
|
||
set loaded_libs($filename) ""
|
||
}
|
||
|
||
load_lib dg.exp
|
||
|
||
# Required to use gcc-dg.exp - however, the latter should NOT be
|
||
# loaded until ${tool}_target_compile is defined since it uses that
|
||
# to determine default LTO options.
|
||
|
||
load_gcc_lib multiline.exp
|
||
load_gcc_lib prune.exp
|
||
load_gcc_lib target-libpath.exp
|
||
load_gcc_lib wrapper.exp
|
||
load_gcc_lib target-supports.exp
|
||
load_gcc_lib target-utils.exp
|
||
load_gcc_lib gcc-defs.exp
|
||
load_gcc_lib timeout.exp
|
||
load_gcc_lib file-format.exp
|
||
load_gcc_lib target-supports-dg.exp
|
||
load_gcc_lib scanasm.exp
|
||
load_gcc_lib scandump.exp
|
||
load_gcc_lib scanrtl.exp
|
||
load_gcc_lib scantree.exp
|
||
load_gcc_lib scanipa.exp
|
||
load_gcc_lib timeout-dg.exp
|
||
load_gcc_lib torture-options.exp
|
||
load_gcc_lib fortran-modules.exp
|
||
|
||
set dg-do-what-default run
|
||
|
||
#
|
||
# GCC_UNDER_TEST is the compiler under test.
|
||
#
|
||
|
||
set libitm_compile_options ""
|
||
|
||
#
|
||
# libitm_init
|
||
#
|
||
|
||
if [info exists TOOL_OPTIONS] {
|
||
set multilibs [get_multilibs $TOOL_OPTIONS]
|
||
} else {
|
||
set multilibs [get_multilibs]
|
||
}
|
||
|
||
proc libitm_init { args } {
|
||
global srcdir blddir objdir tool_root_dir
|
||
global libitm_initialized
|
||
global tmpdir
|
||
global blddir
|
||
global gluefile wrap_flags
|
||
global ALWAYS_CFLAGS
|
||
global CFLAGS
|
||
global TOOL_EXECUTABLE TOOL_OPTIONS
|
||
global GCC_UNDER_TEST
|
||
global TESTING_IN_BUILD_TREE
|
||
global target_triplet
|
||
global always_ld_library_path
|
||
|
||
set blddir [lookfor_file [get_multilibs] libitm]
|
||
|
||
# We set LC_ALL and LANG to C so that we get the same error
|
||
# messages as expected.
|
||
setenv LC_ALL C
|
||
setenv LANG C
|
||
|
||
if ![info exists GCC_UNDER_TEST] then {
|
||
if [info exists TOOL_EXECUTABLE] {
|
||
set GCC_UNDER_TEST $TOOL_EXECUTABLE
|
||
} else {
|
||
set GCC_UNDER_TEST "[find_gcc]"
|
||
}
|
||
}
|
||
|
||
if ![info exists tmpdir] {
|
||
set tmpdir "/tmp"
|
||
}
|
||
|
||
if [info exists gluefile] {
|
||
unset gluefile
|
||
}
|
||
|
||
if {![info exists CFLAGS]} {
|
||
set CFLAGS ""
|
||
}
|
||
|
||
# Locate libgcc.a so we don't need to account for different values of
|
||
# SHLIB_EXT on different platforms
|
||
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
|
||
if {$gccdir != ""} {
|
||
set gccdir [file dirname $gccdir]
|
||
}
|
||
|
||
# Compute what needs to be put into LD_LIBRARY_PATH
|
||
set always_ld_library_path ".:${blddir}/.libs"
|
||
|
||
# Compute what needs to be added to the existing LD_LIBRARY_PATH.
|
||
if {$gccdir != ""} {
|
||
# Add AIX pthread directory first.
|
||
if { [llength [glob -nocomplain ${gccdir}/pthread/libgcc_s*.a]] >= 1 } {
|
||
append always_ld_library_path ":${gccdir}/pthread"
|
||
}
|
||
append always_ld_library_path ":${gccdir}"
|
||
set compiler [lindex $GCC_UNDER_TEST 0]
|
||
|
||
if { [is_remote host] == 0 && [which $compiler] != 0 } {
|
||
foreach i "[exec $compiler --print-multi-lib]" {
|
||
set mldir ""
|
||
regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
|
||
set mldir [string trimright $mldir "\;@"]
|
||
if { "$mldir" == "." } {
|
||
continue
|
||
}
|
||
if { [llength [glob -nocomplain ${gccdir}/${mldir}/libgcc_s*.so.*]] >= 1 } {
|
||
append always_ld_library_path ":${gccdir}/${mldir}"
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
set ALWAYS_CFLAGS ""
|
||
if { $blddir != "" } {
|
||
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/"
|
||
lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}"
|
||
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs"
|
||
}
|
||
lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.."
|
||
|
||
# We use atomic operations in the testcases to validate results.
|
||
if { ([istarget i?86-*-*] || [istarget x86_64-*-*])
|
||
&& [check_effective_target_ia32] } {
|
||
lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
|
||
}
|
||
|
||
if [istarget *-*-darwin*] {
|
||
lappend ALWAYS_CFLAGS "additional_flags=-shared-libgcc"
|
||
}
|
||
|
||
if [istarget sparc*-*-*] {
|
||
lappend ALWAYS_CFLAGS "additional_flags=-mcpu=v9"
|
||
}
|
||
|
||
if [info exists TOOL_OPTIONS] {
|
||
lappend ALWAYS_CFLAGS "additional_flags=$TOOL_OPTIONS"
|
||
}
|
||
|
||
# Make sure that lines are not wrapped. That can confuse the
|
||
# error-message parsing machinery.
|
||
lappend ALWAYS_CFLAGS "additional_flags=-fmessage-length=0"
|
||
|
||
# Turn on transactional memory support.
|
||
lappend ALWAYS_CFLAGS "additional_flags=-fgnu-tm"
|
||
}
|
||
|
||
#
|
||
# libitm_target_compile -- compile a source file
|
||
#
|
||
|
||
proc libitm_target_compile { source dest type options } {
|
||
global blddir
|
||
global libitm_compile_options
|
||
global gluefile wrap_flags
|
||
global ALWAYS_CFLAGS
|
||
global GCC_UNDER_TEST
|
||
global lang_test_file
|
||
global lang_library_path
|
||
global lang_link_flags
|
||
|
||
if { [info exists lang_test_file] } {
|
||
if { $blddir != "" } {
|
||
lappend options "ldflags=-L${blddir}/${lang_library_path}"
|
||
}
|
||
lappend options "ldflags=${lang_link_flags}"
|
||
}
|
||
|
||
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
|
||
lappend options "libs=${gluefile}"
|
||
lappend options "ldflags=${wrap_flags}"
|
||
}
|
||
|
||
lappend options "additional_flags=[libio_include_flags]"
|
||
lappend options "timeout=[timeout_value]"
|
||
lappend options "compiler=$GCC_UNDER_TEST"
|
||
|
||
set options [concat $libitm_compile_options $options]
|
||
|
||
if [info exists ALWAYS_CFLAGS] {
|
||
set options [concat "$ALWAYS_CFLAGS" $options]
|
||
}
|
||
|
||
set options [dg-additional-files-options $options $source]
|
||
|
||
set result [target_compile $source $dest $type $options]
|
||
|
||
return $result
|
||
}
|
||
|
||
proc libitm_option_help { } {
|
||
send_user " --additional_options,OPTIONS\t\tUse OPTIONS to compile the testcase files. OPTIONS should be comma-separated.\n"
|
||
}
|
||
|
||
proc libitm_option_proc { option } {
|
||
if [regexp "^--additional_options," $option] {
|
||
global libitm_compile_options
|
||
regsub "--additional_options," $option "" option
|
||
foreach x [split $option ","] {
|
||
lappend libitm_compile_options "additional_flags=$x"
|
||
}
|
||
return 1
|
||
} else {
|
||
return 0
|
||
}
|
||
}
|