[testsuite] commited: new check-flags proc
Janis Johnson
janis187@us.ibm.com
Thu May 11 00:51:00 GMT 2006
This patch pulls functionality out of dg-skip-if into a separate procedure
so it can be used in multiple places, including a new test directive I'm
working on now. Tested on powerpc64-unknown-linux-gnu, checked in on
mainline. I'll backport it to 4.1 and 4.0 branches in a couple of days
after making sure there are no surprises.
2006-05-10 Janis Johnson <janis187@us.ibm.com>
* lib/target-supports-dg.exp (check-flags): New.
(dg-skip-if): Move flag checks.
Index: gcc/testsuite/lib/target-supports-dg.exp
===================================================================
--- gcc/testsuite/lib/target-supports-dg.exp (revision 113667)
+++ gcc/testsuite/lib/target-supports-dg.exp (working copy)
@@ -170,6 +170,40 @@
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
+# previous dg-options directive.
+
+proc check-flags { args } {
+ global compiler_flags
+ # 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
+ 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 "*-*-*", since we already know it matches.
+ set result [check_conditional_xfail [lreplace $args 1 1 "*-*-*"]]
+
+ # Any value in this variable was left over from an earlier test.
+ set compiler_flags ""
+
+ return $result
+}
+
# Skip the test (report it as UNSUPPORTED) if the target list and
# included flags are matched and the excluded flags are not matched.
#
@@ -181,35 +215,24 @@
# group of tests or flags specified with a previous dg-options command.
proc dg-skip-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" } {
- # 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.
+ # 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
- 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 "*-*-*"]] {
+ if [check-flags $args] {
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 ""
}
}
More information about the Gcc-patches
mailing list