From 2b6107aa7a425a921f5b3afa3cb38e21b165c418 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.r.kempf@gmail.com>
Date: Fri, 30 Oct 2015 16:03:05 +0100
Subject: [PATCH] [CMake] Implement a COMMAND option for dune_add_test
It allows to specify an arbitrary command to be executed
when running the test. This may for example be used to wrap
a script around a C++ executable.
---
cmake/modules/DuneTestMacros.cmake | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/cmake/modules/DuneTestMacros.cmake b/cmake/modules/DuneTestMacros.cmake
index f87e70b13..ef98584d1 100644
--- a/cmake/modules/DuneTestMacros.cmake
+++ b/cmake/modules/DuneTestMacros.cmake
@@ -94,6 +94,17 @@
# processor number :code:`n` higher than one will have the suffix
# :code:`-mpi-n` appended to their name.
#
+# .. cmake_param:: COMMAND
+# :multi:
+# :argname: cmd
+#
+# You may specify the COMMAND option to give the exact command line to be
+# executed when running the test. This defaults to the name of the executable
+# added by dune_add_test for this test. Note, that if you specify both CMD_ARGS
+# and COMMAND, the given CMD_ARGS will be put behind your COMMAND. If you use
+# this in combination with the MPI_RANKS parameter, the call to mpi will still be
+# wrapped around the given commands.
+#
# This function defines the Dune way of adding a test to the testing suite.
# You may either add the executable yourself through :ref:`add_executable`
# and pass it to the :code:`TARGET` option, or you may rely on :ref:`dune_add_test`
@@ -134,7 +145,7 @@ function(dune_add_test)
include(CMakeParseArguments)
set(OPTIONS EXPECT_COMPILE_FAIL EXPECT_FAIL SKIP_ON_77)
set(SINGLEARGS NAME TARGET)
- set(MULTIARGS SOURCES COMPILE_DEFINITIONS COMPILE_FLAGS LINK_LIBRARIES CMD_ARGS MPI_RANKS)
+ set(MULTIARGS SOURCES COMPILE_DEFINITIONS COMPILE_FLAGS LINK_LIBRARIES CMD_ARGS MPI_RANKS COMMAND)
cmake_parse_arguments(ADDTEST "${OPTIONS}" "${SINGLEARGS}" "${MULTIARGS}" ${ARGN})
# Check whether the parser produced any errors
@@ -165,6 +176,9 @@ function(dune_add_test)
get_filename_component(ADDTEST_NAME ${ADDTEST_SOURCES} NAME_WE)
endif()
endif()
+ if(NOT ADDTEST_COMMAND)
+ set(ADDTEST_COMMAND ${ADDTEST_TARGET})
+ endif()
if(NOT ADDTEST_MPI_RANKS)
set(ADDTEST_MPI_RANKS 1)
endif()
@@ -203,22 +217,19 @@ function(dune_add_test)
add_dependencies(build_tests ${ADDTEST_TARGET})
endif()
- # By default, the target itself is sufficient as a testing command.
- set(TESTCOMMAND ${ADDTEST_TARGET})
-
# Process the EXPECT_COMPILE_FAIL option
if(ADDTEST_EXPECT_COMPILE_FAIL)
- set(TESTCOMMAND ${CMAKE_COMMAND} --build . --target ${TESTCOMMAND} --config $<CONFIGURATION>)
+ set(ADDTEST_COMMAND ${CMAKE_COMMAND} --build . --target ${ADDTEST_TARGET} --config $<CONFIGURATION>)
endif()
# Add one test for each specified processor number
foreach(procnum ${ADDTEST_MPI_RANKS})
if(NOT "${procnum}" GREATER "${DUNE_MAX_TEST_CORES}")
if(NOT ${procnum} STREQUAL "1")
- set(ACTUAL_TESTCOMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${procnum} ${TESTCOMMAND} ${MPIEXEC_POSTFLAGS})
+ set(ACTUAL_TESTCOMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${procnum} ${ADDTEST_COMMAND} ${MPIEXEC_POSTFLAGS})
set(ACTUAL_NAME "${ADDTEST_NAME}-mpi-${procnum}")
else()
- set(ACTUAL_TESTCOMMAND ${TESTCOMMAND})
+ set(ACTUAL_TESTCOMMAND ${ADDTEST_COMMAND})
set(ACTUAL_NAME ${ADDTEST_NAME})
endif()
--
GitLab