diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2019-03-26 08:36:26 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2019-03-26 09:40:18 +0000 |
commit | b36a634c9760a82447a90a9b1926d0376366cf3f (patch) | |
tree | 5f41e5c6e2244f39159e1944843d5aa212ce4255 | |
parent | 4ec2ee8cce4c380abd6ee79ecfcc93201ae9e751 (diff) |
stop using python script for cppunit tests
-rw-r--r-- | document/src/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | metrics/src/tests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | persistence/src/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | storage/src/tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | storageapi/src/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | storageframework/src/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | storageserver/src/tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vdslib/src/tests/CMakeLists.txt | 3 | ||||
-rw-r--r-- | vdstestlib/src/tests/cppunit/CMakeLists.txt | 4 |
9 files changed, 9 insertions, 22 deletions
diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt index b78fd66b687..bb668287a8c 100644 --- a/document/src/tests/CMakeLists.txt +++ b/document/src/tests/CMakeLists.txt @@ -54,9 +54,7 @@ vespa_add_executable(document_testrunner_app TEST document_documentconfig ) -# TODO: Test with a larger 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> - DEPENDS document_testrunner_app + COMMAND document_testrunner_app ) diff --git a/metrics/src/tests/CMakeLists.txt b/metrics/src/tests/CMakeLists.txt index afb56757bdd..2c69b83d4b7 100644 --- a/metrics/src/tests/CMakeLists.txt +++ b/metrics/src/tests/CMakeLists.txt @@ -38,6 +38,5 @@ vespa_add_executable(metrics_testrunner_app TEST # TODO: Test with a larger 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> - DEPENDS metrics_testrunner_app + COMMAND metrics_testrunner_app ) diff --git a/persistence/src/tests/CMakeLists.txt b/persistence/src/tests/CMakeLists.txt index d6f6db07f9d..396e9f99655 100644 --- a/persistence/src/tests/CMakeLists.txt +++ b/persistence/src/tests/CMakeLists.txt @@ -7,9 +7,7 @@ vespa_add_executable(persistence_testrunner_app TEST persistence_testspi ) -# TODO: Test with a larger 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> - DEPENDS persistence_testrunner_app + COMMAND persistence_testrunner_app ) diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt index c4436161f28..0ee2330c4ba 100644 --- a/storage/src/tests/CMakeLists.txt +++ b/storage/src/tests/CMakeLists.txt @@ -32,5 +32,6 @@ vespa_add_executable(storage_testrunner_app TEST vespa_add_test( NAME storage_testrunner_app + NO_VALGRIND COMMAND storage_testrunner_app ) diff --git a/storageapi/src/tests/CMakeLists.txt b/storageapi/src/tests/CMakeLists.txt index 2045cca89e1..ebbf3b8357a 100644 --- a/storageapi/src/tests/CMakeLists.txt +++ b/storageapi/src/tests/CMakeLists.txt @@ -26,9 +26,7 @@ vespa_add_executable(storageapi_testrunner_app TEST storageapi ) -# TODO: Test with a larger 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> - DEPENDS storageapi_testrunner_app + COMMAND storageapi_testrunner_app ) diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt index 49c25a275f2..aa4be0783fa 100644 --- a/storageframework/src/tests/CMakeLists.txt +++ b/storageframework/src/tests/CMakeLists.txt @@ -24,9 +24,7 @@ vespa_add_executable(storageframework_testrunner_app TEST storageframework_testthread ) -# TODO: Test with a larger 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> - DEPENDS storageframework_testrunner_app + COMMAND storageframework_testrunner_app ) diff --git a/storageserver/src/tests/CMakeLists.txt b/storageserver/src/tests/CMakeLists.txt index a78aea8aea3..21412e4bc33 100644 --- a/storageserver/src/tests/CMakeLists.txt +++ b/storageserver/src/tests/CMakeLists.txt @@ -11,9 +11,7 @@ vespa_add_executable(storageserver_testrunner_app TEST searchlib_searchlib_uca ) -# TODO: Test with a larger 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> - DEPENDS storageserver_testrunner_app + COMMAND storageserver_testrunner_app ) diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt index e1853ab05bd..1fdc45a3163 100644 --- a/vdslib/src/tests/CMakeLists.txt +++ b/vdslib/src/tests/CMakeLists.txt @@ -29,6 +29,5 @@ vespa_add_executable(vdslib_testrunner_app TEST # TODO: Test with a larger 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> - DEPENDS vdslib_testrunner_app + COMMAND vdslib_testrunner_app ) diff --git a/vdstestlib/src/tests/cppunit/CMakeLists.txt b/vdstestlib/src/tests/cppunit/CMakeLists.txt index 5cb577ce70e..1b8e857fe30 100644 --- a/vdstestlib/src/tests/cppunit/CMakeLists.txt +++ b/vdstestlib/src/tests/cppunit/CMakeLists.txt @@ -7,10 +7,8 @@ vespa_add_executable(vdstestlib_testrunner_app TEST vdstestlib ) -# TODO: Test with a larger 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> - DEPENDS vdstestlib_testrunner_app + COMMAND vdstestlib_testrunner_app ) |