From 1ae696e59a3b389f2fb75a2470762c7595af3ed7 Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Thu, 8 Feb 2001 12:04:57 +0000 Subject: [PATCH] mauve.exp: Added support for XFAILs. * libjava.mauve/mauve.exp: Added support for XFAILs. * libjava.mauve/xfails: New file. From-SVN: r39536 --- libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/libjava.mauve/mauve.exp | 20 +++++++++++++----- libjava/testsuite/libjava.mauve/xfails | 25 +++++++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 libjava/testsuite/libjava.mauve/xfails diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 626bdf7b5ca..df2896e6480 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-02-08 Warren Levy + + * libjava.mauve/mauve.exp: Added support for XFAILs. + * libjava.mauve/xfails: New file. + 2001-01-26 Tom Tromey * libjava.jni/martin.c (Java_martin_myNative): Flush stdout. diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index ba230335a4c..0dc7bc80d99 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -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 . # 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 diff --git a/libjava/testsuite/libjava.mauve/xfails b/libjava/testsuite/libjava.mauve/xfails new file mode 100644 index 00000000000..7ff1a4c0d2f --- /dev/null +++ b/libjava/testsuite/libjava.mauve/xfails @@ -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) -- 2.30.2