Use Cmakelist instead of makefile for test module

Author: alonre24

CMakeLists.txt

@@ -200,6 +200,7 @@ ENDIF()
 #----------------------------------------------------------------------------------------------
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(tests/module)
 ADD_LIBRARY(redisai SHARED $<TARGET_OBJECTS:redisai_obj>)
 
 TARGET_LINK_LIBRARIES(redisai ${CMAKE_DL_LIBS})

tests/flow/tests.sh

@@ -92,7 +92,6 @@ valgrind_summary() {
 #----------------------------------------------------------------------------------------------
 
 run_tests() {
-  make -C ../module
 	local title="$1"
 	[[ ! -z $title ]] && { $ROOT/opt/readies/bin/sep -0; printf "Tests with $title:\n\n"; }
 	cd $ROOT/tests/flow

tests/flow/tests_llapi.py

@@ -12,8 +12,8 @@
 def ensure_test_module_loaded(f):
     @wraps(f)
     def wrapper(env, *args, **kwargs):
-        goal_dir = os.path.join(os.path.dirname(__file__), "../module/LLAPI.so")
-        TEST_MODULE_PATH = os.path.abspath(goal_dir)
+        #goal_dir = os.path.join(os.path.dirname(__file__), "../module/testmod.so")
+        TEST_MODULE_PATH = "{ROOT}/bin/linux-x64-release/src/tests/module/testmod.so".format(ROOT=ROOT)
         con = env.getConnection()
         modules = con.execute_command("MODULE", "LIST")
         if b'RAI_llapi' in [module[1] for module in modules]:

tests/module/CMakeLists.txt

@@ -0,0 +1,5 @@
+ADD_LIBRARY(testmod SHARED LLAPI.c DAG_utils.c)
+
+INCLUDE_DIRECTORIES(../../src)
+SET_TARGET_PROPERTIES(testmod PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES(testmod PROPERTIES SUFFIX ".so")