cleanup: moved unittests to src/tests

also removed unused findlib/unittests
bareos · Sep 14, 2018 · ce536eb · ce536eb
1 parent c35780b
commit ce536eb
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 241 deletions.
diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
@@ -19,7 +19,9 @@
 
 IF(NOT client-only)
    add_subdirectory(tools)
-   add_subdirectory(tests)
+   IF(NOT HAVE_WIN32 AND GTEST_FOUND)
+      add_subdirectory(tests)
+   ENDIF()
    add_subdirectory(cats)
    IF(NOT HAVE_WIN32)
       add_subdirectory(ndmp)

diff --git a/core/src/findlib/unittests/CMakeLists.txt b/core/src/findlib/unittests/CMakeLists.txt
diff --git a/core/src/findlib/unittests/drivetype_test.cc b/core/src/findlib/unittests/drivetype_test.cc
diff --git a/core/src/findlib/unittests/fstype_test.cc b/core/src/findlib/unittests/fstype_test.cc
diff --git a/core/src/findlib/unittests/protos.h b/core/src/findlib/unittests/protos.h
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -110,6 +110,3 @@ ENDIF()
 INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir})
 
 
-IF(NOT HAVE_WIN32 AND GTEST_FOUND)
-   add_subdirectory(unittests)
-ENDIF()
diff --git a/core/src/lib/unittests/CMakeLists.txt b/core/src/lib/unittests/CMakeLists.txt
diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
@@ -17,4 +17,36 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
+add_definitions(-DTEST_SMALL_HTABLE)
 
+IF(HAVE_WIN32)
+   link_libraries(kernel32
+      user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32)
+ENDIF()
+set (TEST_SRC
+    alist_test.cc
+    dlist_test.cc
+    htable_test.cc
+    bsock_test.cc
+   )
+
+add_executable(test_lib
+    ${TEST_SRC}
+    )
+target_link_libraries(test_lib
+   bareos
+   ${JANSSON_LIBRARIES}
+   ${GTEST_LIBRARIES}
+   ${GTEST_MAIN_LIBRARIES}
+   )
+
+add_test(NAME test_lib
+   COMMAND test_lib
+   )
+
+set_property(TEST test_lib
+   PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib"
+   PROPERTY ENVIRONMENT "GTEST_COLOR=yes"
+   )
+
+add_dependencies(check test_lib)
diff --git a/core/src/lib/unittests/alist_test.cc → core/src/tests/alist_test.cc b/core/src/lib/unittests/alist_test.cc → core/src/tests/alist_test.cc
diff --git a/core/src/lib/unittests/bsock_test.cc → core/src/tests/bsock_test.cc b/core/src/lib/unittests/bsock_test.cc → core/src/tests/bsock_test.cc
diff --git a/core/src/lib/unittests/dlist_test.cc → core/src/tests/dlist_test.cc b/core/src/lib/unittests/dlist_test.cc → core/src/tests/dlist_test.cc
diff --git a/core/src/lib/unittests/htable_test.cc → core/src/tests/htable_test.cc b/core/src/lib/unittests/htable_test.cc → core/src/tests/htable_test.cc
diff --git a/core/src/lib/unittests/protos.h → core/src/tests/protos.h b/core/src/lib/unittests/protos.h → core/src/tests/protos.h