diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07760e923b..7813a49a62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ include(${TD_SUPPORT_DIR}/cmake.options)
 include(${TD_SUPPORT_DIR}/cmake.define)
 include(${TD_SUPPORT_DIR}/cmake.version)
 include(${TD_SUPPORT_DIR}/cmake.install)
+enable_testing()
 
 set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES OFF)
 add_subdirectory(contrib)
diff --git a/include/common/tcommon.h b/include/common/tcommon.h
index 13e3bbcee3..204bc30db3 100644
--- a/include/common/tcommon.h
+++ b/include/common/tcommon.h
@@ -124,7 +124,7 @@ enum {
   TMQ_MSG_TYPE__POLL_RAW_DATA_RSP,
 };
 
-static const char* tmqMsgTypeStr[] = {
+static const char* const tmqMsgTypeStr[] = {
     "data", "meta", "ask ep", "meta data", "wal info", "batch meta", "raw data"
 };
 
diff --git a/source/libs/tdb/test/CMakeLists.txt b/source/libs/tdb/test/CMakeLists.txt
index 6319fce86b..fbc9b38424 100644
--- a/source/libs/tdb/test/CMakeLists.txt
+++ b/source/libs/tdb/test/CMakeLists.txt
@@ -1,23 +1,49 @@
 # tdbTest
-add_executable(tdbTest "tdbTest.cpp")
-target_link_libraries(tdbTest tdb gtest gtest_main)
+if(${TD_LINUX})
+    add_executable(tdbTest "tdbTest.cpp")
+    target_link_libraries(tdbTest tdb gtest_main)
+    add_test(
+        NAME tdbTest
+        COMMAND tdbTest
+    )
+endif()
 
 # tdbUtilTest
 add_executable(tdbUtilTest "tdbUtilTest.cpp")
-target_link_libraries(tdbUtilTest tdb gtest gtest_main)
+target_link_libraries(tdbUtilTest tdb gtest_main)
+add_test(
+    NAME tdbUtilTest
+    COMMAND tdbUtilTest
+)
 
 # overflow pages testing
 add_executable(tdbExOVFLTest "tdbExOVFLTest.cpp")
-target_link_libraries(tdbExOVFLTest tdb gtest gtest_main)
+target_link_libraries(tdbExOVFLTest tdb gtest_main)
+add_test(
+    NAME tdbExOVFLTest
+    COMMAND tdbExOVFLTest
+)
 
 # page defragment testing
 add_executable(tdbPageDefragmentTest "tdbPageDefragmentTest.cpp")
-target_link_libraries(tdbPageDefragmentTest tdb gtest gtest_main)
+target_link_libraries(tdbPageDefragmentTest tdb gtest_main)
+add_test(
+    NAME tdbPageDefragmentTest
+    COMMAND tdbPageDefragmentTest
+)
 
 # page recycling testing
 add_executable(tdbPageRecycleTest "tdbPageRecycleTest.cpp")
-target_link_libraries(tdbPageRecycleTest tdb gtest gtest_main)
+target_link_libraries(tdbPageRecycleTest tdb gtest_main)
+add_test(
+    NAME tdbPageRecycleTest
+    COMMAND tdbPageRecycleTest
+)
 
 # page flush testing
 add_executable(tdbPageFlushTest "tdbPageFlushTest.cpp")
-target_link_libraries(tdbPageFlushTest tdb gtest gtest_main)
+target_link_libraries(tdbPageFlushTest tdb gtest_main)
+add_test(
+    NAME tdbPageFlushTest
+    COMMAND tdbPageFlushTest
+)
diff --git a/source/libs/tdb/test/tdbExOVFLTest.cpp b/source/libs/tdb/test/tdbExOVFLTest.cpp
index 388a812ff5..e936eef07a 100644
--- a/source/libs/tdb/test/tdbExOVFLTest.cpp
+++ b/source/libs/tdb/test/tdbExOVFLTest.cpp
@@ -336,8 +336,8 @@ tdbBegin(pEnv, &txn);
     int   vLen = -1;
 
     ret = tdbTbGet(pDb, "key1", strlen("key1"), &pVal, &vLen);
-    ASSERT(ret == -1);
-    GTEST_ASSERT_EQ(ret, -1);
+    ASSERT(ret == TSDB_CODE_NOT_FOUND);
+    GTEST_ASSERT_EQ(ret, TSDB_CODE_NOT_FOUND);
 
     GTEST_ASSERT_EQ(vLen, -1);
     GTEST_ASSERT_EQ(pVal, nullptr);