pauldick 01/04/03 15:13:48
Modified: c/Tests/Harness FileUtility.hpp FileUtility.cpp
Log:
Allow directory search w/o mandating files start with directory name
Revision Changes Path
1.3 +2 -2 xml-xalan/c/Tests/Harness/FileUtility.hpp
Index: FileUtility.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileUtility.hpp 2001/03/15 16:33:28 1.2
+++ FileUtility.hpp 2001/04/03 22:13:46 1.3
@@ -73,7 +73,7 @@
/**
* Utility call that extracts test file names from testsuite.
* @author Paul [EMAIL PROTECTED]
- * @version $Id: FileUtility.hpp,v 1.2 2001/03/15 16:33:28 pauldick Exp $
+ * @version $Id: FileUtility.hpp,v 1.3 2001/04/03 22:13:46 pauldick Exp $
*/
#if defined HARNESS_EXPORTS
@@ -104,7 +104,7 @@
* Utility method used to get test files from a specific directory.
* @returns a vector containing test files.
*/
- FileNameVectorType getTestFileNames(XalanDOMString baseDir,
XalanDOMString relDir);
+ FileNameVectorType getTestFileNames(XalanDOMString baseDir,
XalanDOMString relDir, bool useDirPrefix);
//FileNameVectorType getTestFileNames (char* theDirectory);
/**
1.4 +14 -2 xml-xalan/c/Tests/Harness/FileUtility.cpp
Index: FileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileUtility.cpp 2001/03/15 16:33:33 1.3
+++ FileUtility.cpp 2001/04/03 22:13:46 1.4
@@ -56,11 +56,23 @@
// Notes: It builds the searchSpecification by concatenating all the
// necessary components.
//
*/
-FileNameVectorType FileUtility::getTestFileNames(XalanDOMString baseDir,
XalanDOMString relDir)
+FileNameVectorType FileUtility::getTestFileNames(XalanDOMString baseDir,
XalanDOMString relDir, bool useDirPrefix)
{
const XalanDOMString pathSep(XALAN_STATIC_UCODE_STRING("\\"));
const XalanDOMString
searchSuffix(XALAN_STATIC_UCODE_STRING("*.xsl"));
- const XalanDOMString searchSpecification(baseDir + relDir + pathSep
+ relDir + searchSuffix);
+ XalanDOMString searchSpecification;
+
+ // Allow directory search w/o mandating files start with directory
name. Required for files
+ // garnered from XSLTMARK performance directory exm.
+ if (useDirPrefix)
+ {
+ assign(searchSpecification, baseDir + relDir + pathSep + relDir
+ searchSuffix);
+ }
+ else
+ {
+ assign(searchSpecification, baseDir + relDir + pathSep +
searchSuffix);
+ }
+
DirectoryEnumeratorFunctor<FileNameVectorType, XalanDOMString>
theEnumerator;
FileNameVectorType theFiles;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
