diff --git a/source/libs/transport/test/CMakeLists.txt b/source/libs/transport/test/CMakeLists.txt
index e68e93c48e..3e92ca1812 100644
--- a/source/libs/transport/test/CMakeLists.txt
+++ b/source/libs/transport/test/CMakeLists.txt
@@ -9,7 +9,7 @@ target_sources(transUT
   "transUT.cpp"
 )
 
-target_sources(transportTest 
+target_sources(transportTest
   PRIVATE
   "transportTests.cpp"
 )
@@ -25,16 +25,16 @@ target_sources(cliBench
 target_sources(httpBench
   PRIVATE
   "http_test.c"
-) 
+)
 
-target_include_directories(transportTest 
+target_include_directories(transportTest
   PUBLIC
-  "${TD_SOURCE_DIR}/include/libs/transport" 
+  "${TD_SOURCE_DIR}/include/libs/transport"
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
-target_link_libraries (transportTest
-  os  
+target_link_libraries(transportTest
+  os
   util
   common
   gtest_main
@@ -42,67 +42,67 @@ target_link_libraries (transportTest
   function
 )
 
-target_link_libraries (transUT
-  os  
+target_link_libraries(transUT
+  os
   util
   common
   gtest_main
-  transport 
+  transport
 )
 
 target_include_directories(transUT
   PUBLIC
-  "${TD_SOURCE_DIR}/include/libs/transport" 
+  "${TD_SOURCE_DIR}/include/libs/transport"
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
 target_include_directories(svrBench
   PUBLIC
-  "${TD_SOURCE_DIR}/include/libs/transport" 
+  "${TD_SOURCE_DIR}/include/libs/transport"
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
-target_link_libraries (svrBench
-  os  
+target_link_libraries(svrBench
+  os
   util
   common
   gtest_main
-  transport 
+  transport
 )
 
 target_include_directories(cliBench
   PUBLIC
-  "${TD_SOURCE_DIR}/include/libs/transport" 
+  "${TD_SOURCE_DIR}/include/libs/transport"
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
 target_include_directories(httpBench
   PUBLIC
-  "${TD_SOURCE_DIR}/include/libs/transport" 
+  "${TD_SOURCE_DIR}/include/libs/transport"
   "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
 )
 
-target_link_libraries (cliBench
-  os  
+target_link_libraries(cliBench
+  os
   util
   common
   gtest_main
-  transport 
+  transport
 )
 
 target_link_libraries(httpBench
-  os  
+  os
   util
   common
   gtest_main
-  transport 
+  transport
 )
 
 add_test(
-  NAME transUT 
-  COMMAND transUT 
+  NAME transUT
+  COMMAND transUT
 )
 add_test(
-  NAME transUtilUt 
+  NAME transUtilUt
   COMMAND transportTest
 )
diff --git a/source/os/test/CMakeLists.txt b/source/os/test/CMakeLists.txt
index 324920f37b..cc7110517f 100644
--- a/source/os/test/CMakeLists.txt
+++ b/source/os/test/CMakeLists.txt
@@ -5,12 +5,11 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
 FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64)
 FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64)
 
-IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
+IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
     MESSAGE(STATUS "gTest library found, build os test")
 
     INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
     AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
-
 ENDIF()
 
 INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc)
diff --git a/source/util/test/CMakeLists.txt b/source/util/test/CMakeLists.txt
index 3732c2af59..e801008970 100644
--- a/source/util/test/CMakeLists.txt
+++ b/source/util/test/CMakeLists.txt
@@ -5,7 +5,7 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
 FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64)
 FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64)
 
-IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
+IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
     MESSAGE(STATUS "gTest library found, build unit test")
 
     INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
@@ -20,18 +20,16 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
     LIST(APPEND SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/hashTest.cpp)
     ADD_EXECUTABLE(hashTest ${SOURCE_LIST})
     TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread)
-    
+
     LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
     ADD_EXECUTABLE(trefTest ${BIN_SRC})
     TARGET_LINK_LIBRARIES(trefTest common util)
-
 ENDIF()
 
-#IF (TD_LINUX)
-#    ADD_EXECUTABLE(trefTest ./trefTest.c)
-#    TARGET_LINK_LIBRARIES(trefTest util common)
-#ENDIF ()
-
+# IF (TD_LINUX)
+# ADD_EXECUTABLE(trefTest ./trefTest.c)
+# TARGET_LINK_LIBRARIES(trefTest util common)
+# ENDIF ()
 INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common)
 
@@ -46,8 +44,8 @@ add_test(
 # # freelistTest
 # add_executable(freelistTest "")
 # target_sources(freelistTest
-#     PRIVATE
-#     "freelistTest.cpp"
+# PRIVATE
+# "freelistTest.cpp"
 # )
 # target_link_libraries(freelistTest os util gtest gtest_main)
 
@@ -57,7 +55,7 @@ add_test(
 
 # cfgTest
 add_executable(cfgTest "cfgTest.cpp")
-target_link_libraries(cfgTest os util gtest_main)   
+target_link_libraries(cfgTest os util gtest_main)
 add_test(
     NAME cfgTest
     COMMAND cfgTest
@@ -65,7 +63,7 @@ add_test(
 
 # bloomFilterTest
 add_executable(bloomFilterTest "bloomFilterTest.cpp")
-target_link_libraries(bloomFilterTest os util gtest_main)   
+target_link_libraries(bloomFilterTest os util gtest_main)
 add_test(
     NAME bloomFilterTest
     COMMAND bloomFilterTest
@@ -73,7 +71,7 @@ add_test(
 
 # taosbsearchTest
 add_executable(taosbsearchTest "taosbsearchTest.cpp")
-target_link_libraries(taosbsearchTest os util gtest_main)   
+target_link_libraries(taosbsearchTest os util gtest_main)
 add_test(
     NAME taosbsearchTest
     COMMAND taosbsearchTest
@@ -81,7 +79,7 @@ add_test(
 
 # trbtreeTest
 add_executable(rbtreeTest "trbtreeTest.cpp")
-target_link_libraries(rbtreeTest os util gtest_main)   
+target_link_libraries(rbtreeTest os util gtest_main)
 add_test(
     NAME rbtreeTest
     COMMAND rbtreeTest
@@ -120,17 +118,17 @@ add_test(
 )
 
 add_executable(regexTest "regexTest.cpp")
-target_link_libraries(regexTest os util gtest_main )
+target_link_libraries(regexTest os util gtest_main)
 add_test(
     NAME regexTest
     COMMAND regexTest
 )
 
 add_executable(logTest "log.cpp")
-    target_link_libraries(logTest os util common gtest_main)
-    add_test(
-        NAME logTest
-        COMMAND logTest 
+target_link_libraries(logTest os util common gtest_main)
+add_test(
+    NAME logTest
+    COMMAND logTest
 )
 
 add_executable(decompressTest "decompressTest.cpp")
@@ -140,7 +138,7 @@ add_test(
     COMMAND decompressTest
 )
 
-if (${TD_LINUX})
+if(${TD_LINUX})
     # terrorTest
     add_executable(terrorTest "terrorTest.cpp")
     target_link_libraries(terrorTest os util common gtest_main)
@@ -154,4 +152,4 @@ if (${TD_LINUX})
     add_custom_command(TARGET terrorTest POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ERR_TBL_FILE} $<TARGET_FILE_DIR:terrorTest>
     )
-endif ()
+endif()
diff --git a/tests/taosc_test/CMakeLists.txt b/tests/taosc_test/CMakeLists.txt
index 3ea6964462..c16fe59271 100644
--- a/tests/taosc_test/CMakeLists.txt
+++ b/tests/taosc_test/CMakeLists.txt
@@ -5,15 +5,15 @@ FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include
 FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/)
 FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64 /usr/local/taos/driver/)
 
-IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
+IF(HEADER_GTEST_INCLUDE_DIR AND(LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
     MESSAGE(STATUS "gTest library found, build os test")
 
     INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR})
     AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
-
 ENDIF()
 
 aux_source_directory(src OS_SRC)
+
 # taoscTest
 add_executable(taoscTest "taoscTest.cpp")
 target_link_libraries(taoscTest taos os gtest_main)
@@ -25,4 +25,3 @@ add_test(
     NAME taoscTest
     COMMAND taoscTest
 )
-