[freeflow,multidomain]

Adapt all Ctests to the new architecture of runtest

Reviewd by timok


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15131 2fb0f335-1f38-0410-981e-8018bf24f1b0

test/freeflow/navierstokes/CMakeLists.txt

 add_dumux_test(test_navierstokes test_navierstokes test_navierstokes.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu)

test/freeflow/stokes/CMakeLists.txt

 add_dumux_test(test_stokes test_stokes test_stokes.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu)

test/freeflow/stokes2c/CMakeLists.txt

+add_input_file_links()
+
 add_dumux_test(test_stokes2c test_stokes2c test_stokes2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu)
 
 add_dumux_test(test_stokes2c_diffusion test_stokes2c test_stokes2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2c_diffusion-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c_diffusion-00020.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2c_diffusion.input)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2c_diffusion.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c_diffusion-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c_diffusion-00020.vtu)

test/freeflow/stokes2cni/CMakeLists.txt

+add_input_file_links()
+
 add_dumux_test(test_stokes2cni test_stokes2cni test_stokes2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu)
 
 add_dumux_test(test_stokes2cni_conduction test_stokes2cni test_stokes2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2cni_conduction-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_conduction-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2cni_conduction.input)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2cni_conduction.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni_conduction-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_conduction-00006.vtu)

test/freeflow/zeroeq/CMakeLists.txt

-# test: test_zeroeq
 add_dumux_test(test_zeroeq test_zeroeq test_zeroeq.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq-00006.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq-00006.vtu)
 
-# test: test_zeroeq_channel_channel
 add_dumux_test(test_zeroeq_channel test_zeroeq_channel test_zeroeq_channel.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeqchannel-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeqchannel-00022.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq_channel
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq_channel.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq_channel"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeqchannel-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeqchannel-00022.vtu)

test/freeflow/zeroeq2c/CMakeLists.txt

-# test: test_zeroeq2c
 add_dumux_test(test_zeroeq2c test_zeroeq2c test_zeroeq2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq2c-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00013.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq2c.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2c"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq2c-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00013.vtu)

test/freeflow/zeroeq2cni/CMakeLists.txt

-# test: test_zeroeq2cni
 add_dumux_test(test_zeroeq2cni test_zeroeq2cni test_zeroeq2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq2cni-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00011.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq2cni.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2cni"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq2cni-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00011.vtu)

test/multidomain/2cnistokes2p2cni/CMakeLists.txt

-# test: test_2cnistokes2p2cni_1ff
-add_dumux_test(test_2cnistokes2p2cni_1ff test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
-  )
+add_input_file_links()
 
-# test: test_2cnistokes2p2cni_2pm
-add_dumux_test(test_2cnistokes2p2cni_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
-  )
+add_dumux_test(test_2cnistokes2p2cni test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu)
 
-# test: test_2cnistokes2p2cni_boundarylayer_1ff
-add_dumux_test(test_2cnistokes2p2cni_boundarylayer_1ff test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input
-  )
-
-# test: test_2cnistokes2p2cni_boundarylayer_2pm
-add_dumux_test(test_2cnistokes2p2cni_boundarylayer_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input
-  )
+add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu)

test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt

-file(COPY evaporationRates.gp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+dune_symlink_to_source_files(FILES evaporationRates.gp)
 
-# test: test_2cnizeroeq2p2cni_1ff
-add_dumux_test(test_2cnizeroeq2p2cni_1ff test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input
-  )
-
-# test: test_2cnizeroeq2p2cni_2pm
-add_dumux_test(test_2cnizeroeq2p2cni_2pm test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input
-  )
+add_dumux_test(test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00008.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00008.vtu)

test/multidomain/2cstokes2p2c/CMakeLists.txt

-# test: test_2cstokes2p2c_1ff
-add_dumux_test(test_2cstokes2p2c_1ff test_2cstokes2p2c test_2cstokes2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input  
-  )
-
-# test: test_2cstokes2p2c_2pm
-add_dumux_test(test_2cstokes2p2c_2pm test_2cstokes2p2c test_2cstokes2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input  
-  )
+add_dumux_test(test_2cstokes2p2c test_2cstokes2p2c test_2cstokes2p2c.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu)

test/multidomain/2czeroeq2p2c/CMakeLists.txt

-# test: test_2czeroeq2p2c_1ff
-add_dumux_test(test_2czeroeq2p2c_1ff test_2czeroeq2p2c test_2czeroeq2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00026.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input
-  )
-
-# test: test_2czeroeq2p2c_2pm
-add_dumux_test(test_2czeroeq2p2c_2pm test_2czeroeq2p2c test_2czeroeq2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00026.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input
-  )
+add_dumux_test(test_2czeroeq2p2c test_2czeroeq2p2c test_2czeroeq2p2c.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00026.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00026.vtu)