From 94e338191c8f356e019f541ed8acc3af6542542a Mon Sep 17 00:00:00 2001
From: "Dmitry Yu. Naumov" <github@naumov.de>
Date: Thu, 15 Nov 2018 15:22:37 +0100
Subject: [PATCH] Pass WRAPPER to add_test in OgsTest() cmake.
The option was forgotten.
The WRAPPER command must not be enclosed in double ticks in Tests.cmake.
---
ProcessLib/SmallDeformation/Tests.cmake | 2 +-
scripts/cmake/test/OgsTest.cmake | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake
index e6a44203ea5..316e668df58 100644
--- a/ProcessLib/SmallDeformation/Tests.cmake
+++ b/ProcessLib/SmallDeformation/Tests.cmake
@@ -30,7 +30,7 @@ if (OGS_USE_PYTHON)
endif()
if (OGS_USE_MPI)
- OgsTest(WRAPPER "mpirun -np 4" PROJECTFILE "Mechanics/Linear/disc_with_hole.prj")
+ OgsTest(WRAPPER mpirun -np 4 PROJECTFILE Mechanics/Linear/disc_with_hole.prj)
endif()
# Basic test that MFront works at all.
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index cd9d435b6a5..166c87b88d8 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -3,8 +3,8 @@ function (OgsTest)
return()
endif()
set(options LARGE)
- set(oneValueArgs PROJECTFILE WRAPPER)
- set(multiValueArgs XXX)
+ set(oneValueArgs PROJECTFILE)
+ set(multiValueArgs WRAPPER)
cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}"
"${multiValueArgs}" ${ARGN})
@@ -37,12 +37,12 @@ function (OgsTest)
add_test(
NAME ${TEST_NAME}
WORKING_DIRECTORY "${OgsTest_BINARY_DIR}"
- COMMAND ogs -r "${OgsTest_SOURCE_DIR}" "${OgsTest_SOURCE_DIR}/${OgsTest_NAME}")
+ COMMAND ${OgsTest_WRAPPER} $<TARGET_FILE:ogs> -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME})
# For debugging:
#message("Adding test with
# NAME ${TEST_NAME}
# WORKING_DIRECTORY ${OgsTest_BINARY_DIR}
- # COMMAND ogs -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME}")
+ # COMMAND ${OgsTest_WRAPPER} $<TARGET_FILE:ogs> -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME})
set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT
VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>)
--
GitLab