-# Copyright (C) 1997, 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005 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
load_lib scantree.exp
load_lib prune.exp
load_lib libgloss.exp
+load_lib target-libpath.exp
# We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C
}
global rootme
-set libgcc_s_path "${rootme}"
-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 ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } {
- append libgcc_s_path ":${rootme}/${mldir}"
+global ld_library_path
+global orig_environment_saved
+
+# This file may be sourced, so don't override environment settings
+# that have been previously setup.
+if { $orig_environment_saved == 0 } {
+ set ld_library_path "${rootme}"
+ 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 ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } {
+ append ld_library_path ":${rootme}/${mldir}"
+ }
}
}
-}
-
-# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
-# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
-# (for the 64-bit ABI). The right way to do this would be to modify
-# unix.exp -- but that's not an option since it's part of DejaGNU
-# proper, so we do it here. We really only need to do
-# this on IRIX, but it shouldn't hurt to do it anywhere else.
-# Doing this does cause trouble when testing cross-compilers.
-if {![is_remote target]} {
- if [info exists env(LD_LIBRARY_PATH)] {
- setenv LD_LIBRARY_PATH "$libgcc_s_path:$env(LD_LIBRARY_PATH)"
- } else {
- setenv LD_LIBRARY_PATH $libgcc_s_path
- }
- if [info exists env(SHLIB_PATH)] {
- setenv SHLIB_PATH "$libgcc_s_path:$env(SHLIB_PATH)"
- } else {
- setenv SHLIB_PATH $libgcc_s_path
- }
- if [info exists env(LD_LIBRARYN32_PATH)] {
- setenv LD_LIBRARYN32_PATH "$libgcc_s_path:$env(LD_LIBRARYN32_PATH)"
- } else {
- setenv LD_LIBRARYN32_PATH $libgcc_s_path
- }
- if [info exists env(LD_LIBRARY64_PATH)] {
- setenv LD_LIBRARY64_PATH "$libgcc_s_path:$env(LD_LIBRARY64_PATH)"
- } else {
- setenv LD_LIBRARY64_PATH $libgcc_s_path
- }
- if [info exists env(DYLD_LIBRARY_PATH)] {
- setenv DYLD_LIBRARY_PATH "$libgcc_s_path:$env(DYLD_LIBRARY_PATH)"
- } else {
- setenv DYLD_LIBRARY_PATH $libgcc_s_path
- }
+ set_ld_library_path_env_vars
}
# Split TORTURE_OPTIONS into two choices: one for testcases with loops and
}
}
-# Skip a test and clear all xfail flags that might have been set for it
-# by dg-xfail-if or for the xfail list in dg-do. A procedure that calls
-# this must specify "upvar dg-do-what dg-do-what".
-
-proc skip_test_and_clear_xfail { } {
- global compiler_conditional_xfail_data
- upvar dg-do-what dg-do-what
-
- set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
- if [info exists compiler_conditional_xfail_data] {
- unset compiler_conditional_xfail_data
- }
-}
-
# If this target does not support weak symbols, skip this test.
proc dg-require-weak { args } {
}
if { $weak_available != 1 } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
}
if { $visibility_available != 1 } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
}
if { $alias_available < 2 } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
proc dg-require-gc-sections { args } {
if { ![ check_gc_sections_available ] } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
proc dg-require-profiling { args } {
if { ![ check_profiling_available ${args} ] } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
}
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
proc dg-require-iconv { args } {
if { ![ check_iconv_available ${args} ] } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
proc dg-require-named-sections { args } {
if { ![ check_named_sections_available ] } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
set args [lreplace $args 0 0]
if { ![is-effective-target [lindex $args 0]] } {
upvar dg-do-what dg-do-what
- skip_test_and_clear_xfail
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+ }
+}
+
+# Skip the test (report it as UNSUPPORTED) if the target list and
+# included flags are matched and the excluded flags are not matched.
+#
+# The first argument is the line number of the dg-skip-if directive
+# within the test file. Remaining arguments are as for xfail lists:
+# message { targets } { include } { exclude }
+#
+# This tests against multilib flags plus either the default flags for this
+# group of tests or flags specified with a previous dg-options command.
+
+proc dg-skip-if { args } {
+ set args [lreplace $args 0 0]
+
+ set selector "target [join [lindex $args 1]]"
+ if { [dg-process-target $selector] == "S" } {
+ # The target list matched; now check the flags. The DejaGnu proc
+ # check_conditional_xfail will look at the options in compiler_flags,
+ # so set that up for this test based on flags we know about. Start
+ # the list with a dummy tool name so the list will match "*" if
+ # there are no flags.
+
+ global compiler_flags
+ upvar dg-extra-tool-flags extra_tool_flags
+
+ set compiler_flags " toolname "
+ append compiler_flags $extra_tool_flags
+ set dest [target_info name]
+ if [board_info $dest exists multilib_flags] {
+ append compiler_flags "[board_info $dest multilib_flags] "
+ }
+
+ # The target list might be an effective-target keyword, so replace
+ # the original list with "*-*-*".
+ if [check_conditional_xfail [lreplace $args 1 1 "*-*-*"]] {
+ upvar dg-do-what dg-do-what
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+ }
+
+ # Any value in this variable was left over from an earlier test.
+ set compiler_flags ""
}
}
set selector "target [join [lindex $args 1]]"
if { [dg-process-target $selector] == "S" } {
global compiler_conditional_xfail_data
- set compiler_conditional_xfail_data $args
+ set compiler_conditional_xfail_data [lreplace $args 1 1 "*-*-*"]
}
}
-# Given an optional keyword "target" or "xfail" and the result of a
-# condition which has been evaluated by the framework, return a list
-# containing the keyword and "*-*-*" if the condition is true or
-# "empty-empty-empty" if the condition is false.
-
-proc dg-target-list { what cond } {
- switch $what {
- "target" { set result [list $what] }
- "xfail" { set result [list $what] }
- "" { set result [list] }
- default { error "`$what' not allowed here" }
- }
- if { $cond } {
- lappend result "*-*-*"
- } else {
- lappend result "empty-empty-empty"
- }
- return $result
-}
-
# We need to make sure that additional_* are cleared out after every
# test. It is not enough to clear them out *before* the next test run
# because gcc-target-compile gets run directly from some .exp files
global additional_sources
global additional_prunes
global errorInfo
+ global compiler_conditional_xfail_data
if { [ catch { eval saved-dg-test $args } errmsg ] } {
set saved_info $errorInfo
set additional_files ""
set additional_sources ""
set additional_prunes ""
+ if [info exists compiler_conditional_xfail_data] {
+ unset compiler_conditional_xfail_data
+ }
error $errmsg $saved_info
}
set additional_files ""
set additional_sources ""
set additional_prunes ""
+ if [info exists compiler_conditional_xfail_data] {
+ unset compiler_conditional_xfail_data
+ }
}
}
+
+# Intercept the call to the DejaGnu version of dg-process-target to
+# support use of an effective-target keyword in place of a list of
+# target triplets to xfail or skip a test.
+#
+# selector is one of:
+# xfail target-triplet-1 ...
+# xfail effective-target-keyword
+# target target-triplet-1 ...
+# target effective-target-keyword
+#
+# For a target list the result is "S" if the target is selected, "N" otherwise.
+# For an xfail list the result is "F" if the target is affected, "P" otherwise.
+
+if { [info procs saved-dg-process-target] == [list] } {
+ rename dg-process-target saved-dg-process-target
+
+ proc dg-process-target { args } {
+ verbose "replacement dg-process-target" 2
+
+ # Extract the 'what' keyword from the argument list.
+ set selector [string trim [lindex $args 0]]
+ if [regexp "^xfail " $selector] {
+ set what "xfail"
+ } elseif [regexp "^target " $selector] {
+ set what "target"
+ } else {
+ error "syntax error in target selector \"$selector\""
+ }
+
+ # Extract the rest of the list, which might be a keyword.
+ regsub "^${what}" $selector "" rest
+ set rest [string trim $rest]
+
+ if [is-effective-target-keyword $rest] {
+ # The selector is an effective target keyword.
+ if [is-effective-target $rest] {
+ return [expr { $what == "xfail" ? "F" : "S" }]
+ } else {
+ return [expr { $what == "xfail" ? "P" : "N" }]
+ }
+ }
+
+ # The selector is not an effective-target keyword, so process
+ # the list of target triplets.
+ return [saved-dg-process-target $selector]
+ }
+}
+
set additional_prunes ""
OSDN Git Service
