only load tests you want to run

tests/XSLT/main.cpp

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-
+#include <map>
 
 ///////////////////////////////////////////////
 #include "../CppUnit/TestRunner.hpp"
@@ -15,93 +15,75 @@
 // #include "scope_test.hpp"
 #include "xslt_test.hpp"
 
+std::set<std::string> parse_tests_to_run(int argc, const char* argv[]);
+void add_tests(TestRunner& runner, Loader& loader, const std::set<std::string>& wanted, const char** test_names);
+void add_arabica_tests(TestRunner& runner, Loader& loader, const std::set<std::string>& wanted, const char** test_names);
+
+const char* xalan_tests[] = {"attribvaltemplate", "axes", "boolean", "conditional", 
+                             "conflictres", "copy", "dflt", "expression", "extend", 
+                             /*"idkey",*/ "impincl", "lre", "match", "math", 
+                             "mdocs", "message", "modes", "namedtemplate", 
+                             "namespace", "node", /*"numberformat",*/ /*"numbering",*/
+                             "output", "position", "predicate", "processorinfo", "reluri",
+                             "select", "sort", "string", "variable", "ver", "whitespace", 0};
+
+const char* msft_tests[] = { "AVTs", /*"AttributeSets",*/ "Attributes", "BVTS", 
+                             "Comment", "Completeness", "ConflictResolution", "Copying", 
+                             "Elements", "Errors", "Fallback", "ForEach", /*"FormatNumber",*/
+                             "ForwardComp", /*"Import",*/ /*"Keys",*/ "Messages", 
+                             "Miscellaneous", "Modes", "NamedTemplates", /*"Namespace",*/
+                             /*"Namespace-alias",*/ /*"Namespace_XPath",*/ /*"Number",*/
+                             /*"Output",*/ "ProcessingInstruction", "RTF", "Sorting", 
+                             /*"Stylesheet", */ /*"Template",*/ /*"Text", */ /*"ValueOf",*/
+                             /*"Variables",*/ /*"Whitespaces",*/ "XSLTFunctions", 0 };
+
+const char* arabica_tests[] = { "errors", "include", "processing-instruction", "stylesheet", 0 };
+
 int main(int argc, const char* argv[])
 {
   TestRunner runner;
+  std::set<std::string> tests_to_run = parse_tests_to_run(argc, argv);
 
   // runner.addTest("ScopeTest", ScopeTest_suite<string_type, string_adaptor>());
 
   Loader loader;
-  // Xalan supplied test cases
-  //runner.addTest("attribset", loader.XSLTTest_suite("attribset"));
-  runner.addTest("attribvaltemplate", loader.XSLTTest_suite("attribvaltemplate"));
-  runner.addTest("axes", loader.XSLTTest_suite("axes"));
-  runner.addTest("boolean", loader.XSLTTest_suite("boolean"));
-  runner.addTest("conditional", loader.XSLTTest_suite("conditional"));
-  runner.addTest("conflictres", loader.XSLTTest_suite("conflictres"));
-  runner.addTest("copy", loader.XSLTTest_suite("copy"));
-  runner.addTest("dflt", loader.XSLTTest_suite("dflt"));
-  runner.addTest("expression", loader.XSLTTest_suite("expression"));
-  runner.addTest("extend", loader.XSLTTest_suite("extend"));
-  //runner.addTest("idkey", loader.XSLTTest_suite("idkey"));
-  runner.addTest("impincl", loader.XSLTTest_suite("impincl"));
-  runner.addTest("lre", loader.XSLTTest_suite("lre"));
-  runner.addTest("match", loader.XSLTTest_suite("match"));
-  runner.addTest("math", loader.XSLTTest_suite("math"));
-  runner.addTest("mdocs", loader.XSLTTest_suite("mdocs"));
-  runner.addTest("message", loader.XSLTTest_suite("message"));
-  runner.addTest("modes", loader.XSLTTest_suite("modes"));
-  runner.addTest("namedtemplate", loader.XSLTTest_suite("namedtemplate"));
-  runner.addTest("namespace", loader.XSLTTest_suite("namespace"));
-  runner.addTest("node", loader.XSLTTest_suite("node"));
-  //runner.addTest("numberformat", loader.XSLTTest_suite("numberformat"));
-  //runner.addTest("numbering", loader.XSLTTest_suite("numbering"));
-  runner.addTest("output", loader.XSLTTest_suite("output"));
-  runner.addTest("position", loader.XSLTTest_suite("position"));
-  runner.addTest("predicate", loader.XSLTTest_suite("predicate"));
-  runner.addTest("processorinfo", loader.XSLTTest_suite("processorinfo"));
-  runner.addTest("reluri", loader.XSLTTest_suite("reluri"));
-  runner.addTest("select", loader.XSLTTest_suite("select"));
-  runner.addTest("sort", loader.XSLTTest_suite("sort"));
-  runner.addTest("string", loader.XSLTTest_suite("string"));
-  runner.addTest("variable", loader.XSLTTest_suite("variable"));
-  runner.addTest("ver", loader.XSLTTest_suite("ver"));
-  runner.addTest("whitespace", loader.XSLTTest_suite("whitespace"));
 
-  // MSFT supplied test cases
+  add_tests(runner, loader, tests_to_run, xalan_tests);
-  runner.addTest("AVTs", loader.XSLTTest_suite("AVTs"));
+  add_tests(runner, loader, tests_to_run, msft_tests);
-  //runner.addTest("AttributeSets", loader.XSLTTest_suite("AttributeSets"));
+  add_arabica_tests(runner, loader, tests_to_run, arabica_tests);
-  runner.addTest("Attributes", loader.XSLTTest_suite("Attributes"));
-  runner.addTest("BVTs", loader.XSLTTest_suite("BVTs"));
-  runner.addTest("Comment", loader.XSLTTest_suite("Comment"));
-  runner.addTest("Completeness", loader.XSLTTest_suite("Completeness"));
-  runner.addTest("ConflictResolution", loader.XSLTTest_suite("ConflictResolution"));
-  runner.addTest("Copying", loader.XSLTTest_suite("Copying"));
-  runner.addTest("Elements", loader.XSLTTest_suite("Elements"));
-  runner.addTest("Errors", loader.XSLTTest_suite("Errors"));
-  runner.addTest("Fallback", loader.XSLTTest_suite("Fallback"));
-  runner.addTest("ForEach", loader.XSLTTest_suite("ForEach"));
-  //runner.addTest("FormatNumber", loader.XSLTTest_suite("FormatNumber"));
-  runner.addTest("ForwardComp", loader.XSLTTest_suite("ForwardComp"));
-  //runner.addTest("Import", loader.XSLTTest_suite("Import"));
-  //runner.addTest("Keys", loader.XSLTTest_suite("Keys"));
-  runner.addTest("Messages", loader.XSLTTest_suite("Messages"));
-  //runner.addTest("Miscellaneous", loader.XSLTTest_suite("Miscellaneous"));
-  runner.addTest("Modes", loader.XSLTTest_suite("Modes"));
-  //runner.addTest("NamedTemplates", loader.XSLTTest_suite("NamedTemplates"));
-  //runner.addTest("Namespace", loader.XSLTTest_suite("Namespace"));
-  //runner.addTest("Namespace-alias", loader.XSLTTest_suite("Namespace-alias"));
-  //runner.addTest("Namespace_XPath", loader.XSLTTest_suite("Namespace_XPath"));
-  //runner.addTest("Number", loader.XSLTTest_suite("Number"));
-  //runner.addTest("Output", loader.XSLTTest_suite("Output"));
-  runner.addTest("ProcessingInstruction", loader.XSLTTest_suite("ProcessingInstruction"));
-
-  runner.addTest("RTF", loader.XSLTTest_suite("RTF"));
-  runner.addTest("Sorting", loader.XSLTTest_suite("Sorting"));
-  //runner.addTest("Stylesheet", loader.XSLTTest_suite("Stylesheet"));
-  //runner.addTest("Template", loader.XSLTTest_suite("Template"));
-  //runner.addTest("Text", loader.XSLTTest_suite("Text"));
-  //runner.addTest("Valueof", loader.XSLTTest_suite("Valueof"));
-  //runner.addTest("Variables", loader.XSLTTest_suite("Variables"));
-  //runner.addTest("Whitespaces", loader.XSLTTest_suite("Whitespaces"));
-  runner.addTest("XSLTFunctions", loader.XSLTTest_suite("XSLTFunctions"));
-
-  runner.addTest("ArabicaErrors", loader.ArabicaTest_suite("errors"));
-  runner.addTest("ArabicaInclude", loader.ArabicaTest_suite("include"));
-  runner.addTest("ArabicaProcessingInstruction", loader.ArabicaTest_suite("processing-instruction"));
-  runner.addTest("ArabicaStylesheets", loader.ArabicaTest_suite("stylesheet"));
 
   runner.run(argc, argv);
 
   return 77;
-}
+}  // main
+
+std::set<std::string> parse_tests_to_run(int argc, const char* argv[])
+{
+  std::set<std::string> tests;
+  for(int a = 1; a != argc; ++a)
+    if(argv[a][0] != '-')
+      tests.insert(argv[a]);
+  return tests;
+} // tests_to_run
+
+void add_tests(TestRunner& runner, Loader& loader, const std::set<std::string>& wanted, const char** test_names)
+{
+  std::set<std::string>::const_iterator end = wanted.end();
+  while(*test_names != 0)
+  {
+    if(wanted.empty() || (wanted.find(*test_names) != end))
+      runner.addTest(*test_names, loader.XSLTTest_suite(*test_names));
+    ++test_names;
+  } // while ...
+} // all_all_tests
+
+void add_arabica_tests(TestRunner& runner, Loader& loader, const std::set<std::string>& wanted, const char** test_names)
+{
+  std::set<std::string>::const_iterator end = wanted.end();
+  while(*test_names != 0)
+  {
+    if(wanted.empty() || (wanted.find(*test_names) != end))
+      runner.addTest(*test_names, loader.ArabicaTest_suite(*test_names));
+    ++test_names;
+  } // while ...
+} // all_all_tests