svn commit: r724452 - in /xalan/c/trunk: Tests/Conf/conf.cpp src/xalanc/Harness/XalanFileUtility.cpp src/xalanc/Harness/XalanFileUtility.hpp

Author: dbertoni
Date: Mon Dec  8 11:18:06 2008
New Revision: 724452

URL: http://svn.apache.org/viewvc?rev=724452&view=rev
Log:
Return the error count from main() for the conf executable.

Modified:
    xalan/c/trunk/Tests/Conf/conf.cpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
    xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp

Modified: xalan/c/trunk/Tests/Conf/conf.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Tests/Conf/conf.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/Tests/Conf/conf.cpp (original)
+++ xalan/c/trunk/Tests/Conf/conf.cpp Mon Dec  8 11:18:06 2008
@@ -596,6 +596,8 @@
             logFile.close();
 
             h.analyzeResults(xalan, resultsFile);
+
+            theResult = h.getFailureCount();
         }
     }
     catch(const XalanDiagnosticMemoryManager::LockException&)

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Mon Dec  8 11:18:06 2008
@@ -810,7 +810,6 @@
 
         // Todo: Need to determine if I should check for missing gold in these cases.
         logfile.logCheckFail(data.testOrFile, actexp);
-
     }
 }
 

Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp?rev=724452&r1=724451&r2=724452&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.hpp Mon Dec  8 11:18:06 2008
@@ -155,6 +155,12 @@
         m_verbose = flag;
     }
 
+    int
+    getFailureCount() const
+    {
+        return data.fail;
+    }
+
     /** 
     * Utility method used to get test files from a specific directory.
     * @returns a vector containing test files.
@@ -231,7 +237,6 @@
     XalanDOMString&
     getXercesVersion(XalanDOMString& theResult);
 
-
     void
     checkResults(
             const XalanDOMString&   outputFile, 
@@ -255,7 +260,7 @@
             const char*             actual,
             const char*             expected,
             const char*             msg,
-            XalanXMLFileReporter&        logfile,
+            XalanXMLFileReporter&   logfile,
             const XalanDOMString&   outputFile,
             const XalanDOMString&   goldFile,
             MemoryManager&          /* theManager */,
@@ -302,17 +307,18 @@
             const XalanCompiledStylesheet*  compiledSS,
             const XalanSourceTreeDocument*  dom,
             const XSLTInputSource&          goldInputSource,
-            XalanXMLFileReporter&                logfile);
+            XalanXMLFileReporter&           logfile);
 
     bool
     compareSerializedResults(
             const XalanDOMString&   transformResult,
             const XalanDOMString&   goldInputSource);
+
     /**
-    * Utility method used to create a FormatterToXML FormatterListener.
-    * This is required to DOM comparisions. 
-    * @returns a pointer to a FormatterListener.
-    */
+     * Utility method used to create a FormatterToXML FormatterListener.
+     * This is required to DOM comparisions. 
+     * @returns a pointer to a FormatterListener.
+     */
     FormatterListener* 
     getXMLFormatter(
             PrintWriter&            resultWriter,