--list argument outputs names of all test suites to stdout

2 files changed, 12 insertions, 1 deletions

diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
index 38d5fe1e3c3..3047208798b 100644
--- a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
+++ b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.cpp
@@ -100,6 +100,12 @@ namespace {
     };
 }
 
+void CppUnitTestRunner::listTests(const TestSuite *tests) {
+    for (const auto & test : tests->getTests()) {
+        std::cout << test->getName() << std::endl;
+    }
+}
+
 CppUnitTestRunner::CppUnitTestRunner()
 {
     std::ios::sync_with_stdio();
@@ -108,7 +114,6 @@ CppUnitTestRunner::CppUnitTestRunner()
 int
 CppUnitTestRunner::run(int argc, const char * const * argv)
 {
-    std::cout << "Running cppunit tests.\n";
     CppUnit::TextUi::TestRunner runner;
     CppUnit::TestFactoryRegistry& registry(
             CppUnit::TestFactoryRegistry::getRegistry());
@@ -130,6 +135,9 @@ CppUnitTestRunner::run(int argc, const char * const * argv)
             logStartStop = true;
         } else if (arg == "--includestress") {
             includeStressTests = true;
+        } else if (arg == "--list") {
+            listTests(suite);
+            exit(0);
         } else if (argv[i][0] == '-') {
             std::cerr << "Illegal option " << arg << "\n";
             exit(1);
diff --git a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
index 65a0ca4d434..e8ee1700927 100644
--- a/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
+++ b/vdstestlib/src/vespa/vdstestlib/cppunit/cppunittestrunner.h
@@ -41,12 +41,15 @@
 
 #pragma once
 
+#include <cppunit/TestSuite.h>
+
 namespace vdstestlib {
 
 class CppUnitTestRunner {
 public:
     CppUnitTestRunner();
 
+    void listTests(const CppUnit::TestSuite *tests);
     int run(int argc, const char * const * argv);
 
 };