Merge lp:~brianaker/gearmand/yatl-list into lp:gearmand

[Brian Aker]

=== modified file 'libtest/collection.h'
--- libtest/collection.h	2013-07-02 12:18:03 +0000
+++ libtest/collection.h	2013-08-03 10:12:27 +0000
@@ -67,6 +67,11 @@
     return _name.c_str();
   }
 
+  TestCases& tests()
+  {
+    return _testcases;
+  }
+
   void succeess();
 
   void skip();
 
=== modified file 'libtest/framework.cc'
--- libtest/framework.cc	2013-07-02 12:18:03 +0000
+++ libtest/framework.cc	2013-08-03 10:12:27 +0000
@@ -192,7 +192,7 @@
 
 void Framework::exec()
 {
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
+  for (Suites::iterator iter= _collection.begin();
        iter != _collection.end() and (_signal.is_shutdown() == false);
        ++iter)
   {
 
=== modified file 'libtest/main.cc'
--- libtest/main.cc	2013-07-18 09:54:49 +0000
+++ libtest/main.cc	2013-08-03 10:12:27 +0000
@@ -70,6 +70,8 @@
   unsigned long int opt_repeat= 1; // Run all tests once
   bool opt_verbose= false;
   bool opt_quiet= false;
+  bool opt_list_collection= false;
+  bool opt_list_tests= false;
   std::string collection_to_run;
   std::string wildcard;
   std::string binary_name;
@@ -104,9 +106,12 @@
   // Options parsing
   {
     enum long_option_t {
+      OPT_LIBYATL_HELP,
       OPT_LIBYATL_VERBOSE,
       OPT_LIBYATL_VERSION,
       OPT_LIBYATL_MATCH_COLLECTION,
+      OPT_LIBYATL_LIST_COLLECTIONS,
+      OPT_LIBYATL_LIST_TESTS,
       OPT_LIBYATL_MASSIVE,
       OPT_LIBYATL_QUIET,
       OPT_LIBYATL_MATCH_WILDCARD,
@@ -117,11 +122,14 @@
 
     static struct option long_options[]=
     {
+      { "help", no_argument, NULL, OPT_LIBYATL_HELP },
       { "verbose", no_argument, NULL, OPT_LIBYATL_VERBOSE },
       { "version", no_argument, NULL, OPT_LIBYATL_VERSION },
       { "quiet", no_argument, NULL, OPT_LIBYATL_QUIET },
       { "repeat", required_argument, NULL, OPT_LIBYATL_REPEAT },
       { "collection", required_argument, NULL, OPT_LIBYATL_MATCH_COLLECTION },
+      { "list-collections", no_argument, NULL, OPT_LIBYATL_LIST_COLLECTIONS },
+      { "list-tests", no_argument, NULL, OPT_LIBYATL_LIST_TESTS },
       { "wildcard", required_argument, NULL, OPT_LIBYATL_MATCH_WILDCARD },
       { "massive", no_argument, NULL, OPT_LIBYATL_MASSIVE },
       { "ssl", no_argument, NULL, OPT_LIBYATL_SSL },
@@ -139,6 +147,13 @@
 
       switch (option_rv)
       {
+      case OPT_LIBYATL_HELP:
+        for (struct option *opt= long_options; opt->name; ++opt)
+        {
+          Out << "--" << opt->name;
+        }
+        exit(EXIT_SUCCESS);
+
       case OPT_LIBYATL_VERBOSE:
         opt_verbose= true;
         break;
@@ -160,6 +175,13 @@
         }
         break;
 
+      case OPT_LIBYATL_LIST_TESTS:
+        opt_list_tests= true;
+
+      case OPT_LIBYATL_LIST_COLLECTIONS:
+        opt_list_collection= true;
+        break;
+
       case OPT_LIBYATL_MATCH_COLLECTION:
         collection_to_run= optarg;
         break;
@@ -316,6 +338,30 @@
 
       std::auto_ptr<libtest::Framework> frame(new libtest::Framework(signal, binary_name, collection_to_run, wildcard));
 
+      if (opt_list_collection)
+      {
+        for (Suites::iterator iter= frame->suites().begin();
+             iter != frame->suites().end();
+             ++iter)
+        {
+          if (opt_list_tests)
+          {
+            for (TestCases::iterator test_iter= (*iter)->tests().begin();
+                 test_iter != (*iter)->tests().end();
+                 ++test_iter)
+            {
+              Out << (*iter)->name() << "." << (*test_iter)->name();
+            }
+          }
+          else
+          {
+            Out << (*iter)->name();
+          }
+        }
+        
+        continue;
+      }
+
       // Run create(), bail on error.
       {
         switch (frame->create())