-# Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005, 2007
+# Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005, 2007, 2008, 2009
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
+# DejaGnu's dg-test defines extra flags that are used to compile a test.
+# Access them for directives that need to examine all options that are
+# used for a test, including checks for non-cached effective targets.
+# We don't know how far up the call chain it is but we know we'll hit
+# it eventually, and that we're at least 3 calls down.
+
+proc current_compiler_flags { } {
+ set frames 2
+ while { ![info exists flags1] } {
+ set frames [expr $frames + 1]
+ upvar $frames dg-extra-tool-flags flags1
+ }
+ upvar $frames tool_flags flags2
+ return "$flags1 $flags2"
+}
+
# If this target does not support weak symbols, skip this test.
proc dg-require-weak { args } {
}
}
+# If this target does not support overriding weak symbols, skip this
+# test.
+
+proc dg-require-weak-override { args } {
+ set weak_override_available [ check_weak_override_available ]
+ if { $weak_override_available == -1 } {
+ upvar name name
+ unresolved "$name"
+ }
+ if { $weak_override_available != 1 } {
+ upvar dg-do-what dg-do-what
+ set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+ }
+}
+
# If this target does not support the "visibility" attribute, skip this
# test.
proc dg-require-effective-target { args } {
set args [lreplace $args 0 0]
+ if { [llength $args] != 1 } {
+ error "syntax error, need a single effective-target keyword"
+ }
if { ![is-effective-target [lindex $args 0]] } {
upvar dg-do-what dg-do-what
set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
-# Check the flags with which the test will be run against options in
-# a test directive that will skip or xfail that test. 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.
-
-proc check_test_flags { args } {
- global compiler_flags
- upvar 2 dg-extra-tool-flags extra_tool_flags
-
- # Pull the args out of the enclosing list.
- set args [lindex $args 0]
-
- # Start the list with a dummy tool name so the list will match "*"
- # if there are no 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] "
- }
-
- set answer [check_conditional_xfail $args]
-
- # Any value in this variable originally was left over from an earlier test.
- set compiler_flags ""
-
- verbose "check_test_flags: $args $answer" 2
- return $answer
-}
-
# Compare flags for a test directive against flags that will be used to
# compile the test: multilib flags, flags for torture options, and either
# the default flags for this group of tests or flags specified with a
proc check-flags { args } {
global compiler_flags
global TOOL_OPTIONS
- # These variables are from DejaGnu's dg-test.
- upvar dg-extra-tool-flags extra_tool_flags
- upvar tool_flags tool_flags
# The args are within another list; pull them out.
set args [lindex $args 0]
# Start the list with a dummy tool name so the list will match "*"
# if there are no flags.
set compiler_flags " toolname "
- append compiler_flags $extra_tool_flags
- append compiler_flags $tool_flags
+ append compiler_flags [current_compiler_flags]
# If running a subset of the test suite, $TOOL_OPTIONS may not exist.
catch {append compiler_flags " $TOOL_OPTIONS "}
set dest [target_info name]
set selector [list target [lindex $args 1]]
if { [dg-process-target $selector] == "S" } {
- # These are defined in DejaGnu's dg-test, needed by check-flags.
- upvar dg-extra-tool-flags dg-extra-tool-flags
- upvar tool_flags tool_flags
-
if [check-flags $args] {
upvar dg-do-what dg-do-what
set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
}
}
+# Like dg-xfail-if but for the execute step.
+
+proc dg-xfail-run-if { args } {
+ # Don't bother if we're already skipping the test.
+ upvar dg-do-what dg-do-what
+ if { [lindex ${dg-do-what} 1] == "N" } {
+ return
+ }
+
+ set args [lreplace $args 0 0]
+
+ set selector [list target [lindex $args 1]]
+ if { [dg-process-target $selector] == "S" } {
+ if [check-flags $args] {
+ upvar dg-do-what dg-do-what
+ set dg-do-what [list [lindex ${dg-do-what} 0] "S" "F"]
+ }
+ }
+}
+
# Record whether the program is expected to return a nonzero status.
set shouldfail 0
if { [llength $args] > 1 } {
set selector [list target [lindex $args 1]]
if { [dg-process-target $selector] == "S" } {
- # The target matches, now check the flags. These variables
- # are defined in DejaGnu's dg-test, needed by check-flags.
- upvar dg-extra-tool-flags dg-extra-tool-flags
- upvar tool_flags tool_flags
-
+ # The target matches, now check the flags.
if [check-flags $args] {
set shouldfail 1
}
OSDN Git Service
