* doc/sourcebuild.texi (Test Directives): Document dg-shouldfail.
* lib/gcc-dg.exp (tool_load): Wrapper to support shouldfail tests.
(dg-test): Support shouldfail tests.
* lib/target-supports-dg.exp (dg-shouldfail): New.
* gcc.test-framework/test-framework.awk: Handle shouldfail tests.
* gcc.test-framework/dg-do-run-sf-exp-F.c: New test.
* gcc.test-framework/dg-do-run-sf-exp-P.c: New test.
* gcc.test-framework/dg-do-run-sft-exp-F.c: New test.
* gcc.test-framework/dg-do-run-sft-exp-P.c: New test.
* gcc.test-framework/dg-dox-run-sf-exp-XF.c: New test.
* gcc.test-framework/dg-dox-run-sf-exp-XP.c: New test.
From-SVN: r115913
+2006-08-03 Janis Johnson <janis187@us.ibm.com>
+
+ Backport from mainline
+ * doc/sourcebuild.texi (Test Directives): Document dg-shouldfail.
+
2006-08-03 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR c++/28257
is not covered by the effective-target keyword.
This directive must appear after any @code{dg-do} directive in the test.
+@item @{ dg-shouldfail @var{comment} @{ @var{selector} @} @{ @var{include-opts} @} @{ @var{exclude-opts} @} @}
+Expect the test executable to return a nonzero exit status if the
+conditions (which are the same as for @code{dg-skip-if}) are met.
+
@item @{ dg-error @var{regexp} [@var{comment} [@{ target/xfail @var{selector} @} [@var{line}] @}]] @}
This DejaGnu directive appears on a source line that is expected to get
an error message, or else specifies the source line associated with the
+2006-08-03 Janis Johnson <janis187@us.ibm.com>
+
+ Backport from mainline
+ * lib/gcc-dg.exp (tool_load): Wrapper to support shouldfail tests.
+ (dg-test): Support shouldfail tests.
+ * lib/target-supports-dg.exp (dg-shouldfail): New.
+ * gcc.test-framework/test-framework.awk: Handle shouldfail tests.
+ * gcc.test-framework/dg-do-run-sf-exp-F.c: New test.
+ * gcc.test-framework/dg-do-run-sf-exp-P.c: New test.
+ * gcc.test-framework/dg-do-run-sft-exp-F.c: New test.
+ * gcc.test-framework/dg-do-run-sft-exp-P.c: New test.
+ * gcc.test-framework/dg-dox-run-sf-exp-XF.c: New test.
+ * gcc.test-framework/dg-dox-run-sf-exp-XP.c: New test.
+
2006-08-03 Steve Ellcey <sje@cup.hp.com>
PR c++/28432
--- /dev/null
+/* { dg-do run } */
+/* { dg-shouldfail "required comment" } */
+
+int
+main ()
+{
+ return 0; /* We expect nonzero, so this fails. */
+}
--- /dev/null
+/* { dg-do run } */
+/* { dg-shouldfail "required comment" } */
+
+extern void abort (void);
+
+int
+main ()
+{
+ abort (); /* We expect nonzero, so this passes. */
+}
--- /dev/null
+/* { dg-do run } */
+/* { dg-shouldfail "comment" { unknown-*-* } { "*" } { "" } } */
+
+extern void abort (void);
+
+int
+main ()
+{
+ abort (); /* Directive is ignored so we expect zero; this fails. */
+}
--- /dev/null
+/* { dg-do run } */
+/* { dg-shouldfail "comment" { *-*-* } { "*" } { "" } } */
+
+extern void abort (void);
+
+int
+main ()
+{
+ abort (); /* We expect nonzero exit, so this passes. */
+}
--- /dev/null
+/* { dg-do run { xfail *-*-* } } */
+/* { dg-shouldfail "required comment" } */
+
+int
+main ()
+{
+ return 0; /* We want nonzero but expect to fail; XFAIL. */
+}
--- /dev/null
+/* { dg-do run { xfail *-*-* } } */
+/* { dg-shouldfail "required comment" } */
+
+extern void abort (void);
+
+int
+main ()
+{
+ abort (); /* We want nonzero, but expect to fail; XPASS. */
+}
# of passing tests.
#
#
-# Copyright (c) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (c) 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
/^PASS.*sa.*-1.c.*(test for excess errors)/ { ignore(); next }
# The other dox tests pass the compile step; ignore that message.
/^PASS.*dox.*(test for excess errors)/ { ignore(); next }
+# The sf tests pass the compile step; ignore that message.
+/^PASS.*sf.*(test for excess errors)/ { ignore(); next }
# Ignore lines that begin with comma.
/^,/ { ignore(); next }
# For tests of dg-output, ignore successful compilation.
return $text
}
+# Replace ${tool}_load with a wrapper to provide for an expected nonzero
+# exit status. Multiple languages include this file so this handles them
+# all, not just gcc.
+if { [info procs ${tool}_load] != [list] \
+ && [info procs saved_${tool}_load] == [list] } {
+ rename ${tool}_load saved_${tool}_load
+
+ proc ${tool}_load { program args } {
+ global tool
+ global shouldfail
+ set result [saved_${tool}_load $program $args]
+ if { $shouldfail != 0 } {
+ switch [lindex $result 0] {
+ "pass" { set status "fail" }
+ "fail" { set status "pass" }
+ }
+ set result [list $status [lindex $result 1]]
+ }
+ return $result
+ }
+}
+
# Utility routines.
#
global additional_prunes
global errorInfo
global compiler_conditional_xfail_data
+ global shouldfail
if { [ catch { eval saved-dg-test $args } errmsg ] } {
set saved_info $errorInfo
set additional_files ""
set additional_sources ""
set additional_prunes ""
+ set shouldfail 0
if [info exists compiler_conditional_xfail_data] {
unset compiler_conditional_xfail_data
}
set additional_files ""
set additional_sources ""
set additional_prunes ""
+ set shouldfail 0
if [info exists compiler_conditional_xfail_data] {
unset compiler_conditional_xfail_data
}
}
}
+# Record whether the program is expected to return a nonzero status.
+
+set shouldfail 0
+
+proc dg-shouldfail { 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
+ }
+
+ global shouldfail
+
+ set args [lreplace $args 0 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
+
+ if [check-flags $args] {
+ set shouldfail 1
+ }
+ }
+ } else {
+ set shouldfail 1
+ }
+}
+
# 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.
projects / thirdparty / gcc.git / commitdiff
