pauldick 01/10/11 11:29:47
Modified: c/Tests/Conf conf.cpp
Log:
Minor changes to work with harness updates.
Revision Changes Path
1.5 +6 -10 xml-xalan/c/Tests/Conf/conf.cpp
Index: conf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Conf/conf.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- conf.cpp 2001/09/26 13:08:32 1.4
+++ conf.cpp 2001/10/11 18:29:47 1.5
@@ -95,6 +95,7 @@
const char* const excludeStylesheets[] =
{
+ "output22.xsl",
0
};
@@ -282,9 +283,8 @@
XalanSourceTreeParserLiaison parserLiaison(domSupport);
domSupport.setParserLiaison(&parserLiaison);
-
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid =
futil.GenerateUniqRunid();
+ const XalanDOMString& UniqRunid =
futil.GenerateUniqRunid();
// Defined basic constants for file manipulation and
open results file
@@ -296,14 +296,10 @@
logFile.logTestFileInit("Conformance Testing:");
- // Create run entry that contains runid and number of
iterations used for averages.
-
runAttrs.insert(Hashtable::value_type(XalanDOMString("UniqRunid"), UniqRunid));
-
runAttrs.insert(Hashtable::value_type(XalanDOMString("Xerces-Version "),
futil.getXercesVersion()));
- logFile.logElementWAttrs(10, "RunAttrs", runAttrs,
"xxx");
-
// Get the list of Directories that are below conf
const FileNameVectorType dirs =
futil.getDirectoryNames(baseDir);
+
for(FileNameVectorType::size_type j = 0; j <
dirs.size(); ++j)
{
const XalanDOMString currentDir(dirs[j]);
@@ -355,7 +351,7 @@
// Report the failure and be
sure to increment fail count.
cout << "Failed to PARSE
stylesheet for " << currentFile << endl;
futil.data.fail += 1;
-
logFile.logCheckFail(currentFile);
+
logFile.logErrorResult(currentFile, XalanDOMString("Failed to PARSE
stylesheet."));
continue;
}
@@ -369,7 +365,7 @@
// Report the failure and be
sure to increment fail count.
cout << "Failed to PARSE source
document for " << currentFile << endl;
futil.data.fail += 1;
-
logFile.logCheckFail(currentFile);
+
logFile.logErrorResult(currentFile, XalanDOMString("Failed to PARSE source
document."));
continue;
}
@@ -392,7 +388,7 @@
} //for directories
- futil.reportPassFail(logFile);
+ futil.reportPassFail(logFile, UniqRunid);
logFile.logTestFileClose("Conformance ", "Done");
logFile.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
