2 files changed, 23 insertions, 14 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake
new file mode 100644
index 0000000000..dc02ce5400
--- /dev/null
+++ b/cmake/RunTests.cmake
@@ -0,0 +1,23 @@
+get_filename_component(BUSTED_DIR ${BUSTED_PRG} PATH)
+set(ENV{PATH} "${BUSTED_DIR}:$ENV{PATH}")
+if(DEFINED ENV{TEST_FILE})
+  set(TEST_DIR $ENV{TEST_FILE})
+endif()
+
+if(TEST_TYPE STREQUAL "functional")
+  execute_process(
+    COMMAND python ${BUSTED_PRG} ${BUSTED_REAL_PRG} -v -o
+      ${BUSTED_OUTPUT_TYPE} --lpath=${BUILD_DIR}/?.lua ${TEST_DIR}/legacy
+    WORKING_DIRECTORY ${WORKING_DIR}
+    RESULT_VARIABLE res)
+else()
+  execute_process(
+    COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE}
+      --lpath=${BUILD_DIR}/?.lua ${TEST_DIR}/unit
+    WORKING_DIRECTORY ${WORKING_DIR}
+    RESULT_VARIABLE res)
+endif()
+
+if(NOT res EQUAL 0)
+  message(FATAL_ERROR "Unit tests failed.")
+endif()
diff --git a/cmake/RunUnittests.cmake b/cmake/RunUnittests.cmake
deleted file mode 100644
index f51fc8a90a..0000000000
--- a/cmake/RunUnittests.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-get_filename_component(BUSTED_DIR ${BUSTED_PRG} PATH)
-set(ENV{PATH} "${BUSTED_DIR}:$ENV{PATH}")
-if(DEFINED ENV{TEST_FILE})
-  set(TEST_DIR $ENV{TEST_FILE})
-endif()
-
-execute_process(
-  COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE} --lpath=${BUILD_DIR}/?.lua ${TEST_DIR}
-  WORKING_DIRECTORY ${WORKING_DIR}
-  RESULT_VARIABLE res)
-
-if(NOT res EQUAL 0)
-  message(FATAL_ERROR "Unit tests failed.")
-endif()