Merge branch 'fix/python-test-script-calls' into 'master'

[test] Execute the test script directly (and let it decide with Python interpreter to use) See merge request !115

Merge branch 'fix/python-test-script-calls' into 'master'
[test] Execute the test script directly (and let it decide with Python interpreter to use) See merge request !115
0c9c86f0 · Kilian Weishaupt · ff9ed606 · 94299402 · 0c9c86f0 · 0c9c86f0
Commit 0c9c86f0 authored May 26, 2020 by Kilian Weishaupt
--- a/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt
+++ b/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt
@@ -2,30 +2,27 @@ add_input_file_links()

 dune_add_test(NAME lens2pexercise3
              SOURCES lens2pexercise3.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise3-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00011.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p")
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise3-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00011.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p")

 dune_add_test(NAME lens2p2cexercise3
              SOURCES lens2p2cexercise3.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p2c-exercise3-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-2p2c-00011.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2p2cexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p2c")
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p2c-exercise3-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-2p2c-00011.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens2p2cexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p2c")

 dune_add_test(NAME lens1p2cexercise3
              SOURCES lens1p2cexercise3.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-1p2c-exercise3-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-1p2c-00011.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens1p2cexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-1p2c")
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-1p2c-exercise3-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-1p2c-00011.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens1p2cexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-1p2c")

 # headers for installation and headercheck
 install(FILES

--- a/lecture/efm/1p2cvs2p/CMakeLists.txt
+++ b/lecture/efm/1p2cvs2p/CMakeLists.txt
@@ -2,22 +2,20 @@ add_input_file_links()

 dune_add_test(NAME lens1p2cexercise1
              SOURCES lens1p2cexercise1.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-1p2c-exercise1-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-1p2c-00103.vtu
-                         --command "${CMAKE_CURRENT_BINARY_DIR}/lens1p2cexercise1 ${CMAKE_CURRENT_SOURCE_DIR}/exercise1.input -Problem.Name lens-1p2c"
-                         --zeroThreshold {"x^N2_liq":1e-18,"X^N2_liq":1e-18})
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-1p2c-exercise1-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-1p2c-00103.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens1p2cexercise1 ${CMAKE_CURRENT_SOURCE_DIR}/exercise1.input -Problem.Name lens-1p2c"
+                       --zeroThreshold {"x^N2_liq":1e-18,"X^N2_liq":1e-18})

 dune_add_test(NAME lens2pexercise1
              SOURCES lens2pexercise1.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise1-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00101.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise1 ${CMAKE_CURRENT_SOURCE_DIR}/exercise1.input -Problem.Name lens-2p")
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise1-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00101.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise1 ${CMAKE_CURRENT_SOURCE_DIR}/exercise1.input -Problem.Name lens-2p")

 # headers for installation and headercheck
 install(FILES

--- a/lecture/efm/2p/CMakeLists.txt
+++ b/lecture/efm/2p/CMakeLists.txt
@@ -2,12 +2,11 @@ add_input_file_links()

 dune_add_test(NAME lens2pexercise2
              SOURCES lens2pexercise2.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise2-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00051.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise2")
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/lens-2p-exercise2-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/lens-2p-00051.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise2")

 # headers for installation and headercheck
 install(FILES

--- a/lecture/mhs/groundwater/CMakeLists.txt
+++ b/lecture/mhs/groundwater/CMakeLists.txt
@@ -2,9 +2,8 @@ add_input_file_links()

 dune_add_test(NAME groundwater
              SOURCES groundwater.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                       --script fuzzy
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
                       --files ${CMAKE_SOURCE_DIR}/lecture/references/groundwater-reference.vtu
                               ${CMAKE_CURRENT_BINARY_DIR}/groundwater-00000.vtu
                       --command "${CMAKE_CURRENT_BINARY_DIR}/groundwater -TimeManager.TEnd 1.0")

--- a/lecture/mm/buckleyleverett/CMakeLists.txt
+++ b/lecture/mm/buckleyleverett/CMakeLists.txt
@@ -2,12 +2,11 @@ add_input_file_links()

 dune_add_test(NAME buckleyleverettexercise
              SOURCES buckleyleverettexercise.cc
-              COMMAND python
-              CMD_ARGS ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
-                 --script fuzzy
-                 --files ${CMAKE_SOURCE_DIR}/lecture/references/buckleyleverett-reference.vtu
-                         ${CMAKE_CURRENT_BINARY_DIR}/buckleyleverett-00062.vtu
-                 --command ./buckleyleverettexercise)
+              COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/lecture/references/buckleyleverett-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/buckleyleverett-00062.vtu
+                       --command ./buckleyleverettexercise)

 # headers for installation and headercheck
 install(FILES