From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <mauve-patches-return-1323-listarch-mauve-patches=sources.redhat.com@sourceware.org>
Received: (qmail 5665 invoked by alias); 11 Jun 2008 10:07:58 -0000
Received: (qmail 5542 invoked by uid 22791); 11 Jun 2008 10:07:56 -0000
X-Spam-Check-By: sourceware.org
Received: from vegas.theobroma-systems.com (HELO mail.theobroma-systems.com) (88.198.52.168)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 11 Jun 2008 10:07:36 +0000
Received: from [86.59.122.178] (port=44825 helo=[10.0.2.106]) 	by mail.theobroma-systems.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) 	(Exim 4.63) 	(envelope-from <twisti@complang.tuwien.ac.at>) 	id 1K6NEl-000498-Aa 	for mauve-patches@sourceware.org; Wed, 11 Jun 2008 12:07:32 +0200
Subject: fix missing failures in XML output
From: Christian Thalinger <twisti@complang.tuwien.ac.at>
To: mauve-patches ml <mauve-patches@sourceware.org>
Content-Type: text/plain
Date: Wed, 11 Jun 2008 10:07:00 -0000
Message-Id: <1213178846.28056.15.camel@cthalinger.lan>
Mime-Version: 1.0
X-Mailer: Evolution 2.22.1
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact mauve-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <mauve-patches.sourceware.org>
List-Subscribe: <mailto:mauve-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/mauve-patches/>
List-Post: <mailto:mauve-patches@sourceware.org>
List-Help: <mailto:mauve-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: mauve-patches-owner@sourceware.org
X-SW-Source: 2008/txt/msg00045.txt.bz2

Hi!

This fixes missing failures in the XML output.  Commited.

- twisti

---

Index: ChangeLog
===================================================================
RCS file: /cvs/mauve/mauve/ChangeLog,v
retrieving revision 1.2112
diff -u -3 -p -r1.2112 ChangeLog
--- ChangeLog	9 Jun 2008 13:54:35 -0000	1.2112
+++ ChangeLog	11 Jun 2008 10:05:17 -0000
@@ -1,3 +1,9 @@
+2008-06-11  Christian Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* RunnerProcess.java (check(Object, Object)): Changed code so we
+	don't have early returns and miss currentResult.addFail() calls.
+	This fixes a bug in missing failures in the XML output.
+
 2008-06-09  Christian Thalinger  <twisti@complang.tuwien.ac.at>
 
 	* gnu/testlet/java/security/AccessController/contexts.java (test):
Index: RunnerProcess.java
===================================================================
RCS file: /cvs/mauve/mauve/RunnerProcess.java,v
retrieving revision 1.17
diff -u -3 -p -r1.17 RunnerProcess.java
--- RunnerProcess.java	19 May 2008 08:19:34 -0000	1.17
+++ RunnerProcess.java	11 Jun 2008 10:05:17 -0000
@@ -546,19 +546,19 @@ public class RunnerProcess
                 lastFailureMessage = "\n           got " + gotString
                                    + "\n\n           but expected " + expString
                                    + "\n\n";
-                System.out.println(lastFailureMessage);
-                return;
               }
             else
               {
-                lastFailureMessage = "Objects were not equal";
-                System.out.println("objects were not equal.  " +
-                        "Use -debug for more information.");
-                return;
+                lastFailureMessage = "Objects were not equal.  " +
+                        "Use -debug for more information.";
               }
           }
-        lastFailureMessage = "got " + gotString + " but expected " + expString;
-        currentResult.addFail(desc + " -- " +lastFailureMessage);
+        else
+          {
+            lastFailureMessage =
+              "got " + gotString + " but expected " + expString;
+          }
+        currentResult.addFail(desc + " -- " + lastFailureMessage);
         System.out.println(lastFailureMessage);
       }
   }