Add gtest runner in storageframework and migrate timetest from CppUnit to gtest.

1 files changed, 18 insertions, 1 deletions

diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt
index 0d604d64f74..0e562508d4c 100644
--- a/storageframework/src/tests/CMakeLists.txt
+++ b/storageframework/src/tests/CMakeLists.txt
@@ -1,9 +1,26 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# Runner for unit tests written in gtest.
+# NOTE: All new test classes should be added here.
+vespa_add_executable(storageframework_gtest_runner_app TEST
+    SOURCES
+    gtest_runner.cpp
+    DEPENDS
+    storageframework_testclock
+    gtest
+)
+
+vespa_add_test(
+    NAME storageframework_gtest_runner_app
+    COMMAND storageframework_gtest_runner_app
+    DEPENDS storageframework_gtest_runner_app
+)
+
+# Runner for unit tests written in CppUnit (DEPRECATED).
 vespa_add_executable(storageframework_testrunner_app TEST
     SOURCES
     testrunner.cpp
     DEPENDS
-    storageframework_testclock
     storageframework_teststatus
     storageframework_testthread
 )