From 621799f78582f576aa6cd7674f54ac1a1acacc1f Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 27 Nov 2017 15:22:28 +0100
Subject: [PATCH] [1p][test] Use new dune_add_test semantics with separate
cmd_args
---
.../1p/implicit/compressible/CMakeLists.txt | 60 +++++++++----------
.../1p/implicit/incompressible/CMakeLists.txt | 30 +++++-----
2 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt
index b41db2f129..93803d4db5 100644
--- a/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt
@@ -4,56 +4,56 @@ dune_symlink_to_source_files(FILES "test_1p.input" "test_1p_stationary.input")
dune_add_test(NAME test_1p_compressible_tpfa
SOURCES test_1p.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_tpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_tpfa test_1p.input -Problem.Name 1p_tpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_tpfa test_1p.input -Problem.Name 1p_tpfa")
dune_add_test(NAME test_1p_compressible_mpfa
SOURCES test_1p.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_mpfa-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_mpfa test_1p.input -Problem.Name 1p_mpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_mpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_mpfa test_1p.input -Problem.Name 1p_mpfa")
dune_add_test(NAME test_1p_compressible_box
SOURCES test_1p.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_box-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_box test_1p.input -Problem.Name 1p_box")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_box test_1p.input -Problem.Name 1p_box")
# compressible stationary
dune_add_test(NAME test_1p_compressible_stationary_tpfa
SOURCES test_1p_stationary.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_tpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa test_1p_stationary.input -Problem.Name 1p_stationary_tpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_tpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa test_1p_stationary.input -Problem.Name 1p_stationary_tpfa")
dune_add_test(NAME test_1p_compressible_stationary_mpfa
SOURCES test_1p_stationary.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_mpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa test_1p_stationary.input -Problem.Name 1p_stationary_mpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_mpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa test_1p_stationary.input -Problem.Name 1p_stationary_mpfa")
dune_add_test(NAME test_1p_compressible_stationary_box
SOURCES test_1p_stationary.cc
COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_box-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_box test_1p_stationary.input -Problem.Name 1p_stationary_box")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_box-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_box test_1p_stationary.input -Problem.Name 1p_stationary_box")
set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
index f5d8d0b7f6..259bf65e4f 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
@@ -4,30 +4,30 @@ dune_symlink_to_source_files(FILES "test_1p.input")
dune_add_test(NAME test_1p_incompressible_tpfa
SOURCES test_1pfv.cc
COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestcctpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa test_1p.input -Problem.Name 1ptestcctpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestcctpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa test_1p.input -Problem.Name 1ptestcctpfa")
# using mpfa
dune_add_test(NAME test_1p_incompressible_mpfa
SOURCES test_1pfv.cc
COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleMpfa
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_mpfa test_1p.input -Problem.Name 1ptestccmpfa")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_mpfa test_1p.input -Problem.Name 1ptestccmpfa")
# using box
dune_add_test(NAME test_1p_incompressible_box
SOURCES test_1pfv.cc
COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox
- COMMAND python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_box test_1p.input -Problem.Name 1ptestbox")
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_box test_1p.input -Problem.Name 1ptestbox")
set(CMAKE_BUILD_TYPE Release)
--
GitLab