From 389dd0cbd86888161711942833b1627e7d616ce2 Mon Sep 17 00:00:00 2001
From: Rian Quinn <rianquinn@gmail.com>
Date: Tue, 23 Jan 2018 08:14:34 -0700
Subject: [PATCH] Enable More Unit Tests (#580)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a small patch that enables more unit tests

[ISSUE]: https://github.com/Bareflank/hypervisor/issues/576

Signed-off-by: “rianquinn” <“rianquinn@gmail.com”>
---
 bfvmm/tests/hve/CMakeLists.txt | 41 +++++++++++++---------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/bfvmm/tests/hve/CMakeLists.txt b/bfvmm/tests/hve/CMakeLists.txt
index 6414dc31c..9ffed028b 100644
--- a/bfvmm/tests/hve/CMakeLists.txt
+++ b/bfvmm/tests/hve/CMakeLists.txt
@@ -16,11 +16,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEXIT_HANDLER_TEST")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEXIT_HANDLER_TEST")
-
-do_test(test_exit_handler
-    SOURCES arch/intel_x64/exit_handler/test_exit_handler.cpp
+list(APPEND ARGN
     DEPENDS bfvmm_hve
     DEPENDS bfvmm_memory_manager
     DEFINES STATIC_HVE
@@ -28,29 +24,22 @@ do_test(test_exit_handler
     DEFINES STATIC_INTRINSICS
 )
 
+do_test(test_exit_handler
+    SOURCES arch/intel_x64/exit_handler/test_exit_handler.cpp
+    ${ARGN}
+)
+
 do_test(test_exit_handler_entry
     SOURCES arch/intel_x64/exit_handler/test_exit_handler_entry.cpp
-    DEPENDS bfvmm_hve
-    DEPENDS bfvmm_memory_manager
-    DEFINES STATIC_HVE
-    DEFINES STATIC_MEMORY_MANAGER
-    DEFINES STATIC_INTRINSICS
+    ${ARGN}
 )
 
-# do_test(test_vmcs
-#     SOURCES arch/intel_x64/vmcs/test_vmcs.cpp
-#     DEPENDS bfvmm_hve
-#     DEPENDS bfvmm_memory_manager
-#     DEFINES STATIC_HVE
-#     DEFINES STATIC_MEMORY_MANAGER
-#     DEFINES STATIC_INTRINSICS
-# )
+do_test(test_vmcs
+    SOURCES arch/intel_x64/vmcs/test_vmcs.cpp
+    ${ARGN}
+)
 
-# do_test(test_vmxon
-#     SOURCES arch/intel_x64/vmxon/test_vmxon.cpp
-#     DEPENDS bfvmm_hve
-#     DEPENDS bfvmm_memory_manager
-#     DEFINES STATIC_HVE
-#     DEFINES STATIC_MEMORY_MANAGER
-#     DEFINES STATIC_INTRINSICS
-# )
+do_test(test_vmxon
+    SOURCES arch/intel_x64/vmxon/test_vmxon.cpp
+    ${ARGN}
+)