Patch: Recognize XFAILs in mauve.exp

[Warren Levy <warrenl at redhat dot com>]

Folks,
I recently hacked Mauve to output XFAIL and XPASS so here are the patches
on this end to make use of it.  The new xfails file below is a baseline;
it may not yet yield a completely clean run (some Mauve tests are kind of
funky and need to be fixed up), but I wanted to get this in before the
branch (since this lends itself to producing more reliable code by
highlighting regressions).

Anyway, here's the patch.  Enjoy!
--warrenl


2001-02-08  Warren Levy  <warrenl@redhat.com>

        * libjava.mauve/mauve.exp: Added support for XFAILs.
        * libjava.mauve/xfails: New file.


Index: libjava.mauve/mauve.exp
===================================================================
RCS file: /cvs/gcc/egcs/libjava/testsuite/libjava.mauve/mauve.exp,v
retrieving revision 1.11
diff -u -p -r1.11 mauve.exp
--- mauve.exp	2000/12/18 23:13:05	1.11
+++ mauve.exp	2001/02/08 11:41:49
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000 Free Software Foundation.
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation.
 # Written by Tom Tromey <tromey@cygnus.com>.
 # Incorporate Mauve into libjava's DejaGNU test suite framework.
 
@@ -107,6 +107,8 @@ proc test_mauve {} {
   puts -nonewline $fd $c
   close $fd
 
+  catch {system "ln -s $full_srcdir/libjava.mauve/xfails xfails"}
+
   if {[catch {
     system "make KEYS=libgcj classes.stamp 2>&1"
   } msg]} then {
@@ -188,8 +190,11 @@ proc test_mauve {} {
 
     # Extract pass/failure info from output.
     foreach line [split [lindex $result 1] \n] {
-      if {[regexp -- {^(PASS|FAIL): (.*)$} $line ignore what msg]} then {
-	if {$what == "PASS"} then {
+      if {[regexp -- {^(PASS|FAIL|XFAIL|XPASS): (.*)$} $line ignore what msg]} then {
+	if {$what == "XFAIL" || $what == "XPASS"} then {
+	  setup_xfail *-*-*
+	}
+	if {$what == "PASS" || $what == "XPASS"} then {
 	  pass $msg
 	} else {
 	  fail $msg
@@ -237,6 +242,8 @@ proc test_mauve_sim {} {
   puts -nonewline $fd $c
   close $fd
 
+  catch {system "ln -s $full_srcdir/libjava.mauve/xfails xfails"}
+
   if {[catch {
     system "make KEYS=libgcj classes.stamp 2>&1"
   } msg]} then {
@@ -345,8 +352,11 @@ proc test_mauve_sim {} {
 
     # Extract pass/failure info from output.
     foreach line [split [lindex $result 1] \n] {
-      if {[regexp -- {^(PASS|FAIL): (.*)$} $line ignore what msg]} then {
-	if {$what == "PASS"} then {
+      if {[regexp -- {^(PASS|FAIL|XFAIL|XPASS): (.*)$} $line ignore what msg]} then {
+	if {$what == "XFAIL" || $what == "XPASS"} then {
+	  setup_xfail *-*-*
+	}
+	if {$what == "PASS" || $what == "XPASS"} then {
 	  pass $msg
 	} else {
 	  fail $msg
Index: libjava.mauve/xfails
===================================================================
RCS file: xfails
diff -N xfails
--- /dev/null	Tue May  5 13:32:27 1998
+++ xfails	Thu Feb  8 03:41:49 2001
@@ -0,0 +1,25 @@
+FAIL: gnu.testlet.java.lang.Double.DoubleTest: Error: test_shortbyteValue failed - 5 (number 1)
+FAIL: gnu.testlet.java.lang.Float.FloatTest: Error: test_shortbyteValue failed - 5 (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Four Byte Range Error (0) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Four Byte Range Error (1) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Five Bytes (0) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Five Bytes (1) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Six Bytes (0) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Six Bytes (1) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Orphan Continuation (1) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Orphan Continuation (2) (number 1)
+FAIL: gnu.testlet.java.io.Utf8Encoding.mojo: Four Byte Range Error (2) (number 1)
+FAIL: gnu.testlet.java.io.ObjectStreamClass.Test: getSerialVersionUID (number 7)
+FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: patterns (number 2)
+FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: equals() (number 1)
+FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: parse() strict (number 1)
+FAIL: gnu.testlet.java.text.SimpleDateFormat.getAndSet2DigitYearStart: get2DigitYearStart() initial (number 1)
+FAIL: gnu.testlet.java.net.ServerSocket.ServerSocketTest: Error : test_params failed - 5getInetAddress did not return proper values  (number 1)
+FAIL: gnu.testlet.java.net.Socket.SocketTest: Error : test_BasicServer failed - 11 exception was thrown :Illegal seek (number 1)
+FAIL: gnu.testlet.java.net.URLConnection.URLConnectionTest: Error in test_Basics  - 2  should not have raised  Throwable here  (number 1)
+FAIL: gnu.testlet.java.net.URL.URLTest: openStream (number 1)
+FAIL: gnu.testlet.java.net.URL.URLTest: sameFile (number 2)
+FAIL: gnu.testlet.java.net.URL.URLTest:  Error in test_toString  - 5  exception should not be thrown here (number 1)
+FAIL: gnu.testlet.java.net.URL.URLTest: new URL(protocol, host, file) (number 26)
+FAIL: gnu.testlet.java.net.URL.URLTest: new URL(protocol, host, file) (number 54)
+FAIL: gnu.testlet.java.net.MulticastSocket.MulticastSocketTest: joinGroup() twice. (number 1)