Resolve the 'test_utility' dependency of 'libsarus'

eth-cscs · Jul 25, 2024 · 7b1f2e0 · 7b1f2e0
1 parent ca8b736
commit 7b1f2e0
Show file tree

Hide file tree

Showing 25 changed files with 743 additions and 333 deletions.
diff --git a/src/libsarus/test/CMakeLists.txt b/src/libsarus/test/CMakeLists.txt
@@ -1,18 +1,18 @@
+add_subdirectory(aux)
+
 include(add_unit_test)
-set(link_libraries "test_utility_library")
-set(object_files_directory
-  "${CMAKE_BINARY_DIR}/src/common/CMakeFiles/common_library.dir")
+set(link_libraries "libsarus_testaux")
 
-add_unit_test(libsarus_Utility_AsRoot test_Utility.cpp "${link_libraries}")
-add_unit_test_as_root(libsarus_MountUtility test_MountUtility.cpp "${link_libraries}")
-add_unit_test(libsarus_HookUtility_AsRoot test_HookUtility.cpp "${link_libraries}")
-add_unit_test(libsarus_Logger test_Logger.cpp "${link_libraries}")
-add_unit_test(libsarus_Error test_Error.cpp "${link_libraries}")
 add_unit_test(libsarus_CLIArguments test_CLIArguments.cpp "${link_libraries}")
-add_unit_test_as_root(libsarus_Mount test_Mount.cpp "${link_libraries}")
-add_unit_test_as_root(libsarus_DeviceParser test_DeviceParser.cpp "${link_libraries}")
+add_unit_test(libsarus_Error test_Error.cpp "${link_libraries}")
+add_unit_test(libsarus_Flock test_Flock.cpp "${link_libraries}")
+add_unit_test(libsarus_HookUtility test_HookUtility.cpp "${link_libraries}")
+add_unit_test(libsarus_Lockfile test_Lockfile.cpp "${link_libraries}")
+add_unit_test(libsarus_Logger test_Logger.cpp "${link_libraries}")
 add_unit_test(libsarus_MountParser test_MountParser.cpp "${link_libraries}")
 add_unit_test(libsarus_PasswdDB test_PasswdDB.cpp "${link_libraries}")
-add_unit_test(libsarus_Lockfile test_Lockfile.cpp "${link_libraries}")
-add_unit_test(libsarus_Flock test_Flock.cpp "${link_libraries}")
-add_unit_test_as_root(libsarus_DeviceMount_AsRoot test_DeviceMount.cpp "${link_libraries}")
+add_unit_test_as_root(libsarus_DeviceMount test_DeviceMount.cpp "${link_libraries}")
+add_unit_test_as_root(libsarus_DeviceParser test_DeviceParser.cpp "${link_libraries}")
+add_unit_test_as_root(libsarus_MountUtility test_MountUtility.cpp "${link_libraries}")
+add_unit_test_as_root(libsarus_Mount test_Mount.cpp "${link_libraries}")
+add_unit_test_as_root(libsarus_Utility test_Utility.cpp "${link_libraries}")
diff --git a/src/libsarus/test/DeviceParserChecker.hpp b/src/libsarus/test/DeviceParserChecker.hpp
diff --git a/src/libsarus/test/MountParserChecker.hpp b/src/libsarus/test/MountParserChecker.hpp
diff --git a/src/libsarus/test/aux/CMakeLists.txt b/src/libsarus/test/aux/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB libsarus_testaux_srcs "*.cpp")
+add_library(libsarus_testaux STATIC ${libsarus_testaux_srcs})
+target_link_libraries(libsarus_testaux ${Boost_LIBRARIES} libsarus)
+set_target_properties(libsarus_testaux PROPERTIES PREFIX "")