From b09ba1bce84e77fba38d0a0bfd7a22d4296ae2bd Mon Sep 17 00:00:00 2001
From: Simon Scholz <simon.scholz@iws.uni-stuttgart.de>
Date: Thu, 16 Nov 2017 17:28:45 +0100
Subject: [PATCH] [tests][2pnc][3p] fix COMMAND and CMD_ARGS
---
.../2pnc/implicit/CMakeLists.txt | 8 ++--
.../3p/implicit/CMakeLists.txt | 42 +++++++++----------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
index ed1db8ff8b..d55646db5e 100644
--- a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
@@ -3,16 +3,16 @@ dune_symlink_to_source_files(FILES test_2pnc.input)
# isothermal tests
dune_add_test(NAME test_box2pnc
SOURCES test_box2pnc.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pncbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fuelcell-box-00015.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-box")
dune_add_test(NAME test_cc2pnc
SOURCES test_cc2pnc.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pnccc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fuelcell-cc-00015.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-cc")
diff --git a/test/porousmediumflow/3p/implicit/CMakeLists.txt b/test/porousmediumflow/3p/implicit/CMakeLists.txt
index fd9c80347c..deeff68155 100644
--- a/test/porousmediumflow/3p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/CMakeLists.txt
@@ -3,16 +3,16 @@ add_input_file_links()
# isothermal tests
dune_add_test(NAME test_box3p
SOURCES test_box3p.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/infiltration3pbox-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box3p")
dune_add_test(NAME test_cc3p
SOURCES test_cc3p.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pcc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/infiltration3pcc-00008.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3p")
@@ -20,8 +20,8 @@ dune_add_test(NAME test_cc3p
# non-isothermal tests
dune_add_test(NAME test_box3pniconvection
SOURCES test_box3pniconvection.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectionbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection-00010.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection"
@@ -29,30 +29,30 @@ dune_add_test(NAME test_box3pniconvection
dune_add_test(NAME test_cc3pniconvection
SOURCES test_cc3pniconvection.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
dune_add_test(NAME test_box3pniconduction
SOURCES test_box3pniconduction.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction-00006.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction"
--zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
dune_add_test(NAME test_cc3pniconduction
SOURCES test_cc3pniconduction.cc
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
#install sources
install(FILES
--
GitLab