Remove explicit paths from cmake add_test() calls.

With this alternative syntax, CMake recognizes the logical names of
binaries built during the build process and runs them appropriately,
irrespective of their location.
Also removed an unnecessary enable_testing() from tests/CMakeLists.txt.

Change-Id: Ie7d7c6f96d92dfab4450d06178bb507c2cdc6a7c

diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake
index 0bdc0ccd2d7830d453fdedce16aab5025d4ddf2c..5d6c86cda3d8f1f6f36ac3ce167c4587badac1cd 100644 (file)
--- a/src/testutils/TestMacros.cmake
+++ b/src/testutils/TestMacros.cmake
@@ -9,7 +9,8 @@ function (add_gtest_test NAME EXENAME)
         endif ()
         list(APPEND DEFS TEST_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
         set_target_properties(${EXENAME} PROPERTIES COMPILE_DEFINITIONS ${DEFS})
-        add_test(${NAME} ${EXENAME})
+        add_test(NAME ${NAME}
+                 COMMAND ${EXENAME})
     endif ()
 endfunction ()
 
@@ -24,7 +25,8 @@ function (add_gmock_test NAME EXENAME)
         endif ()
         list(APPEND DEFS TEST_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
         set_target_properties(${EXENAME} PROPERTIES COMPILE_DEFINITIONS ${DEFS})
-        add_test(${NAME} ${EXENAME})
+        add_test(NAME ${NAME}
+                 COMMAND ${EXENAME})
     endif ()
 endfunction ()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e7a39ae99c6eec9413ab78d58dfb6a95c9437334..d1c2d7061068a275f82e7039c74a8f2015c1209b 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1,2 @@
-enable_testing()
-add_test(TestExec_mdrun-h ../src/kernel/mdrun -h)
+add_test(NAME TestExec_mdrun-h
+         COMMAND mdrun -h)