Parallize cppunit test runner test suites using cppunit-parallelize.py

11 files changed, 61 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aed0ca2fc20..952c370e043 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,4 +75,3 @@ __create_module_targets(TEST_TARGETS "test")
 
 # Post installation steps. Need to be the last install(...) call in this file.
 install(CODE "execute_process(COMMAND ${CMAKE_CURRENT_LIST_DIR}/dist/post_install.sh ${CMAKE_INSTALL_PREFIX})")
-
diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt
index 14bbeaa90d0..83eb2571626 100644
--- a/document/src/tests/CMakeLists.txt
+++ b/document/src/tests/CMakeLists.txt
@@ -33,4 +33,9 @@ vespa_add_executable(document_testrunner_app TEST
     AFTER
     document_documentconfig
 )
-vespa_add_test(NAME document_testrunner_app COMMAND document_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME document_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:document_testrunner_app>
+)
diff --git a/memfilepersistence/src/tests/CMakeLists.txt b/memfilepersistence/src/tests/CMakeLists.txt
index 119577bd777..079a8036e95 100644
--- a/memfilepersistence/src/tests/CMakeLists.txt
+++ b/memfilepersistence/src/tests/CMakeLists.txt
@@ -9,4 +9,9 @@ vespa_add_executable(memfilepersistence_testrunner_app TEST
     memfilepersistence_testspi
     memfilepersistence_testtools
 )
-vespa_add_test(NAME memfilepersistence_testrunner_app COMMAND memfilepersistence_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME memfilepersistence_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:memfilepersistence_testrunner_app>
+)
diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt
index d361713d8ec..27dd72d3aa8 100644
--- a/metrics/src/tests/CMakeLists.txt
+++ b/metrics/src/tests/CMakeLists.txt
@@ -15,4 +15,9 @@ vespa_add_executable(metrics_testrunner_app TEST
     metrics
     vdstestlib
 )
-vespa_add_test(NAME metrics_testrunner_app COMMAND metrics_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME metrics_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:metrics_testrunner_app>
+)
diff --git a/persistence/src/tests/CMakeLists.txt b/persistence/src/tests/CMakeLists.txt
index 934bc54eb9c..df9dd6cd1f4 100644
--- a/persistence/src/tests/CMakeLists.txt
+++ b/persistence/src/tests/CMakeLists.txt
@@ -6,4 +6,9 @@ vespa_add_executable(persistence_testrunner_app TEST
     persistence_testdummyimpl
     persistence_testspi
 )
-vespa_add_test(NAME persistence_testrunner_app COMMAND persistence_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME persistence_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:persistence_testrunner_app>
+)
diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt
index fb5bc146983..bcceb12a935 100644
--- a/storage/src/tests/CMakeLists.txt
+++ b/storage/src/tests/CMakeLists.txt
@@ -16,4 +16,9 @@ vespa_add_executable(storage_testrunner_app TEST
     storage_testmemory
     storage_teststatus
 )
-vespa_add_test(NAME storage_testrunner_app COMMAND storage_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME storage_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:storage_testrunner_app>
+)
diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt
index 2d98f06456d..ad7117076fe 100644
--- a/storageapi/src/tests/CMakeLists.txt
+++ b/storageapi/src/tests/CMakeLists.txt
@@ -8,4 +8,9 @@ vespa_add_executable(storageapi_testrunner_app TEST
     storageapi_testmbusprot
     storageapi
 )
-vespa_add_test(NAME storageapi_testrunner_app COMMAND storageapi_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME storageapi_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:storageapi_testrunner_app>
+)
diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt
index d96113597fd..9f39a171cba 100644
--- a/storageframework/src/tests/CMakeLists.txt
+++ b/storageframework/src/tests/CMakeLists.txt
@@ -8,4 +8,9 @@ vespa_add_executable(storageframework_testrunner_app TEST
     storageframework_testmemory
     storageframework_testthread
 )
-vespa_add_test(NAME storageframework_testrunner_app COMMAND storageframework_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME storageframework_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:storageframework_testrunner_app>
+)
diff --git a/storageserver/src/tests/CMakeLists.txt b/storageserver/src/tests/CMakeLists.txt
index 738fc332383..a0d00400f7c 100644
--- a/storageserver/src/tests/CMakeLists.txt
+++ b/storageserver/src/tests/CMakeLists.txt
@@ -10,4 +10,9 @@ vespa_add_executable(storageserver_testrunner_app TEST
     vdstestlib
     searchlib_searchlib_uca
 )
-vespa_add_test(NAME storageserver_testrunner_app COMMAND storageserver_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME storageserver_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:storageserver_testrunner_app>
+)
diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt
index d2b00ce8e70..a63560c0d77 100644
--- a/vdslib/src/tests/CMakeLists.txt
+++ b/vdslib/src/tests/CMakeLists.txt
@@ -8,4 +8,9 @@ vespa_add_executable(vdslib_testrunner_app TEST
     vdslib_teststate
     vdslib_testthread
 )
-vespa_add_test(NAME vdslib_testrunner_app COMMAND vdslib_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME vdslib_testrunner_app
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:vdslib_testrunner_app>
+)
diff --git a/vdstestlib/src/tests/cppunit/CMakeLists.txt b/vdstestlib/src/tests/cppunit/CMakeLists.txt
index 190ef213ca1..062a021ac41 100644
--- a/vdstestlib/src/tests/cppunit/CMakeLists.txt
+++ b/vdstestlib/src/tests/cppunit/CMakeLists.txt
@@ -6,4 +6,10 @@ vespa_add_executable(vdstestlib_testrunner_app TEST
     DEPENDS
     vdstestlib
 )
-vespa_add_test(NAME vdstestlib_testrunner_app NO_VALGRIND COMMAND vdstestlib_testrunner_app)
+
+# TODO: Test with a larget chunk size to parallelize test suite runs 
+vespa_add_test(
+    NAME vdstestlib_testrunner_app
+    NO_VALGRIND
+    COMMAND python ${PROJECT_SOURCE_DIR}/cppunit-parallelize.py --chunks 1 $<TARGET_FILE:vdstestlib_testrunner_app>
+)