Fix double linkage for tests

[alexxy/gromacs.git] / src / testutils / TestMacros.cmake

diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake
index 828e9e4808ea9166356fbd91e00485cf93393259..b3acdbefd16539468521696d034ef14e18d7900b 100644 (file)
--- a/src/testutils/TestMacros.cmake
+++ b/src/testutils/TestMacros.cmake
@@ -1,10 +1,10 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2011,2012, by the GROMACS development team, led by
-# David van der Spoel, Berk Hess, Erik Lindahl, and including many
-# others, as listed in the AUTHORS file in the top-level source
-# directory and at http://www.gromacs.org.
+# Copyright (c) 2011,2012,2013,2014, by the GROMACS development team, led by
+# Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+# and including many others, as listed in the AUTHORS file in the
+# top-level source directory and at http://www.gromacs.org.
 #
 # GROMACS is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public License
@@ -32,20 +32,56 @@
 # To help us fund GROMACS development, we humbly ask that you cite
 # the research papers on the package. Check out http://www.gromacs.org.
 
-function (gmx_add_unit_test NAME EXENAME)
+function (gmx_add_unit_test_object_library NAME)
+    if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
+        include_directories(BEFORE ${GMOCK_INCLUDE_DIRS})
+        add_library(${NAME} OBJECT ${UNITTEST_TARGET_OPTIONS} ${ARGN})
+        set_property(TARGET ${NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS}")
+    endif()
+endfunction ()
+
+function (gmx_build_unit_test NAME EXENAME)
+    if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
+        include_directories(BEFORE ${GMOCK_INCLUDE_DIRS})
+        add_executable(${EXENAME} ${UNITTEST_TARGET_OPTIONS} ${ARGN} ${TESTUTILS_DIR}/unittest_main.cpp)
+        set_property(TARGET ${EXENAME} APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS}")
+        target_link_libraries(${EXENAME} ${TESTUTILS_LIBS} libgromacs ${GMOCK_LIBRARIES} ${GMX_EXE_LINKER_FLAGS})
+        set(_temporary_files_path "${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary")
+        file(MAKE_DIRECTORY ${_temporary_files_path})
+
+        # Note that the quotation marks in the next line form part of
+        # the defined symbol, so that the macro replacement in the
+        # source file is as a string.
+        set(EXTRA_COMPILE_DEFINITIONS TEST_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}" TEST_TEMP_PATH="${_temporary_files_path}")
+
+        set_property(TARGET ${EXENAME} APPEND PROPERTY COMPILE_DEFINITIONS "${EXTRA_COMPILE_DEFINITIONS}")
+    endif()
+endfunction ()
+
+function (gmx_register_unit_test NAME EXENAME)
     if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
-        include_directories(${GMOCK_INCLUDE_DIRS})
-        add_executable(${EXENAME} ${ARGN} ${TESTUTILS_DIR}/unittest_main.cpp)
-        target_link_libraries(${EXENAME} libgromacs ${TESTUTILS_LIBS} ${GMOCK_LIBRARIES} ${GMX_EXE_LINKER_FLAGS})
-        get_target_property(DEFS ${EXENAME} COMPILE_DEFINITIONS)
-        if (NOT DEFS)
-            set(DEFS)
-        endif ()
-        list(APPEND DEFS TEST_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
-        set_target_properties(${EXENAME} PROPERTIES COMPILE_DEFINITIONS ${DEFS})
         add_test(NAME ${NAME}
-                 COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${EXENAME}.xml)
-        set_tests_properties(${NAME} PROPERTIES LABELS "GTest")
+                 COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${NAME}.xml)
+        set_tests_properties(${NAME} PROPERTIES LABELS "GTest;UnitTest")
         add_dependencies(tests ${EXENAME})
-    endif ()
+    endif()
 endfunction ()
+
+function (gmx_register_integration_test NAME EXENAME)
+    if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
+        add_test(NAME ${NAME}
+                 COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${NAME}.xml)
+        # TODO consider whether integration tests should be run by the check target
+        set_tests_properties(${testname} PROPERTIES LABELS "IntegrationTest")
+        add_dependencies(tests ${EXENAME})
+
+        # GMX_EXTRA_LIBRARIES might be needed for mdrun integration tests at
+        # some point.
+        # target_link_libraries(${EXENAME} ${GMX_EXTRA_LIBRARIES})
+    endif()
+endfunction ()
+
+function (gmx_add_unit_test NAME EXENAME)
+    gmx_build_unit_test(${NAME} ${EXENAME} ${ARGN})
+    gmx_register_unit_test(${NAME} ${EXENAME})
+endfunction()