Commit 761900c3 authored by GILLES Sebastien's avatar GILLES Sebastien

#1264 CTest: remove the redundant 'Test' preffix; for models use a specific MOREFEM_RESULT_DIR.

parent 248b545c
......@@ -119,6 +119,8 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
enable_testing()
set(MOREFEM_TEST_OUTPUT_DIR /tmp/MoReFEM/${CMAKE_C_COMPILER_ID}/${CMAKE_BUILD_TYPE})
######################################################
# Walk through Sources directory to find all sources to build.
......
......@@ -26,21 +26,25 @@ morefem_install(MoReFEM4Elasticity MoReFEM4Elasticity_lib)
add_test(ElasticityModel3D
MoReFEM4Elasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(ElasticityModel3D-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Elasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_test(ElasticityModel2D
MoReFEM4Elasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(ElasticityModel2D-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Elasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_executable(MoReFEM4ElasticityEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
target_link_libraries(MoReFEM4ElasticityEnsightOutput
......
......@@ -25,21 +25,25 @@ target_link_libraries(MoReFEM4Heat
add_test(HeatModel2D
MoReFEM4Heat
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(HeatModel2D-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Heat
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_test(HeatModel1D
MoReFEM4Heat
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat_1d.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat_1d.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(HeatModel1D-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Heat
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat_1d.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Heat/demo_input_heat_1d.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
morefem_install(MoReFEM4Heat MoReFEM4Heat_lib)
......
......@@ -26,12 +26,14 @@ morefem_install(MoReFEM4Hyperelasticity MoReFEM4Hyperelasticity_lib)
add_test(Hyperelasticity
MoReFEM4Hyperelasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Hyperelasticity/demo_input_hyperelasticity.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Hyperelasticity/demo_input_hyperelasticity.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(Hyperelasticity-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Hyperelasticity
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Hyperelasticity/demo_input_hyperelasticity.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Hyperelasticity/demo_input_hyperelasticity.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_executable(MoReFEM4HyperelasticityEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
......
......@@ -24,12 +24,14 @@ target_link_libraries(MoReFEM4Laplacian
add_test(Laplacian
MoReFEM4Laplacian
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Laplacian/demo_input_laplacian.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Laplacian/demo_input_laplacian.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(Laplacian-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Laplacian
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Laplacian/demo_input_laplacian.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Laplacian/demo_input_laplacian.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
morefem_install(MoReFEM4Laplacian MoReFEM4Laplacian_lib)
......
......@@ -26,21 +26,25 @@ morefem_install(MoReFEM4RivlinCube MoReFEM4RivlinCube_lib)
add_test(RivlinCubeHexa
MoReFEM4RivlinCube
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(RivlinCubeHexa-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4RivlinCube
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_test(RivlinCubeTetra
MoReFEM4RivlinCube
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(RivlinCubeTetra-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4RivlinCube
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
add_executable(MoReFEM4RivlinCubeEnsightOutput ${CMAKE_CURRENT_LIST_DIR}/main_ensight_output.cpp)
......
......@@ -25,11 +25,13 @@ target_link_libraries(MoReFEM4Stokes
add_test(Stokes
MoReFEM4Stokes
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Stokes/demo_input_stokes.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Stokes/demo_input_stokes.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq)
add_test(Stokes-mpi
${OPEN_MPI_INCL_DIR}/../bin/mpirun
-np 4 MoReFEM4Stokes
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Stokes/demo_input_stokes.lua)
-i ${MOREFEM_ROOT}/Sources/ModelInstances/Stokes/demo_input_stokes.lua
-e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4)
morefem_install(MoReFEM4Stokes MoReFEM4Stokes_lib)
......@@ -5,6 +5,6 @@ add_executable(MoReFEMTestMoReFEMDataCommandLineOptions
target_link_libraries(MoReFEMTestMoReFEMDataCommandLineOptions
${MOREFEM_CORE})
add_test(TestMoReFEMDataCommandLineOptions MoReFEMTestMoReFEMDataCommandLineOptions)
add_test(MoReFEMDataCommandLineOptions MoReFEMTestMoReFEMDataCommandLineOptions)
morefem_install(MoReFEMTestMoReFEMDataCommandLineOptions)
......@@ -31,9 +31,9 @@ target_link_libraries(MoReFEMTestOperatorGradGrad2D MoReFEMTestOperatorGradGrad_
add_executable(MoReFEMTestOperatorGradGrad1D ${CMAKE_CURRENT_LIST_DIR}/main_1D.cpp)
target_link_libraries(MoReFEMTestOperatorGradGrad1D MoReFEMTestOperatorGradGrad_lib)
add_test(TestOperatorGradGrad3D MoReFEMTestOperatorGradGrad3D)
add_test(TestOperatorGradGrad2D MoReFEMTestOperatorGradGrad2D)
add_test(TestOperatorGradGrad1D MoReFEMTestOperatorGradGrad1D)
add_test(OperatorGradGrad3D MoReFEMTestOperatorGradGrad3D)
add_test(OperatorGradGrad2D MoReFEMTestOperatorGradGrad2D)
add_test(OperatorGradGrad1D MoReFEMTestOperatorGradGrad1D)
morefem_install(MoReFEMTestOperatorGradGrad1D MoReFEMTestOperatorGradGrad2D MoReFEMTestOperatorGradGrad3D MoReFEMTestOperatorGradGrad_lib)
......
......@@ -31,9 +31,9 @@ target_link_libraries(MoReFEMTestOperatorMass2D MoReFEMTestOperatorMass_lib)
add_executable(MoReFEMTestOperatorMass1D ${CMAKE_CURRENT_LIST_DIR}/main_1D.cpp)
target_link_libraries(MoReFEMTestOperatorMass1D MoReFEMTestOperatorMass_lib)
add_test(TestOperatorMass3D MoReFEMTestOperatorMass3D)
add_test(TestOperatorMass2D MoReFEMTestOperatorMass2D)
add_test(TestOperatorMass1D MoReFEMTestOperatorMass1D)
add_test(OperatorMass3D MoReFEMTestOperatorMass3D)
add_test(OperatorMass2D MoReFEMTestOperatorMass2D)
add_test(OperatorMass1D MoReFEMTestOperatorMass1D)
morefem_install(MoReFEMTestOperatorMass1D MoReFEMTestOperatorMass2D MoReFEMTestOperatorMass3D MoReFEMTestOperatorMass_lib)
......
......@@ -24,7 +24,7 @@ add_executable(MoReFEMTestNonLinearMembrane ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
target_link_libraries(MoReFEMTestNonLinearMembrane
MoReFEMTestNonLinearMembrane_lib)
add_test(TestNonLinearMembrane MoReFEMTestNonLinearMembrane)
add_test(NonLinearMembrane MoReFEMTestNonLinearMembrane)
morefem_install(MoReFEMTestNonLinearMembrane MoReFEMTestNonLinearMembrane_lib)
......@@ -17,4 +17,4 @@ add_executable(MoReFEMTestHyperelasticOperator
target_link_libraries(MoReFEMTestHyperelasticOperator
MoReFEM_test_tools)
add_test(TestHyperelasticOperator MoReFEMTestHyperelasticOperator)
add_test(HyperelasticOperator MoReFEMTestHyperelasticOperator)
......@@ -5,6 +5,6 @@ add_executable(MoReFEMTestEnvironment
target_link_libraries(MoReFEMTestEnvironment
${MOREFEM_UTILITIES})
add_test(TestEnvironment MoReFEMTestEnvironment)
add_test(Environment MoReFEMTestEnvironment)
morefem_install(MoReFEMTestEnvironment)
......@@ -5,6 +5,6 @@ add_executable(MoReFEMTestLuaOptionFile
target_link_libraries(MoReFEMTestLuaOptionFile
${MOREFEM_UTILITIES})
add_test(TestLuaOptionFile MoReFEMTestLuaOptionFile)
add_test(LuaOptionFile MoReFEMTestLuaOptionFile)
morefem_install(MoReFEMTestLuaOptionFile)
......@@ -5,6 +5,6 @@ add_executable(MoReFEMTestGetTypeName
target_link_libraries(MoReFEMTestGetTypeName
${MOREFEM_UTILITIES})
add_test(TestGetTypeName MoReFEMTestGetTypeName)
add_test(GetTypeName MoReFEMTestGetTypeName)
morefem_install(MoReFEMTestGetTypeName)
\ No newline at end of file
morefem_install(MoReFEMTestGetTypeName)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment