Commit 8b422589 authored by GILLES Sebastien's avatar GILLES Sebastien

#1248 Script integration test: fix some issues.

parent c45c5e64
......@@ -205,7 +205,7 @@ class CheckMoReFEM:
cmd = ("ninja",
"-j",
str(multiprocessing.cpu_count()),
model_name)
os.path.join("Sources", model_name))
self.__PrintCmd(cmd)
......@@ -368,12 +368,7 @@ if __name__ == "__main__":
morefem_path = os.path.join("/Users", os.environ['USER'], "Codes", "MoReFEM", "CoreLibrary")
cases = ('clang_debug', 'clang_release', 'gcc_debug', 'gcc_release', 'llvm-clang_debug')
cases = ('clang_debug', )# 'clang_release', 'clang_debug_macro', 'llvm-clang_debug')
cases = ('clang_debug', 'clang_release', 'llvm-clang_debug')
for case in cases:
......
......@@ -44,44 +44,44 @@ def TestTargetList():
# Add it properly in the upcoming continuous integration test!
return (\
TestTarget('test_input_parameter_data', \
TestTarget('MoReFEMTestInputParameterList', \
('Sources/Test/Utilities/InputParameterList/demo_input_parameter_test_ipl.lua', )),
TestTarget('test_mpi_functions', \
TestTarget('MoReFEMTestMpiFunctions', \
('Sources/Test/ThirdParty/Mpi/Functions/demo_input_parameter_mpi_functions.lua', ),
is_sequential = False
),
TestTarget('test_mpi_send_receive_array', \
TestTarget('MoReFEMTestMpiSendReceiveArray', \
('Sources/Test/ThirdParty/Mpi/SendReceive/demo_input_parameter_mpi_send_receive.lua', ),
is_sequential = False
),
TestTarget('test_mpi_send_receive_single_value', \
TestTarget('MoReFEMTestMpiSendReceiveSingleValue', \
('Sources/Test/ThirdParty/Mpi/SendReceive/demo_input_parameter_mpi_send_receive.lua', ),
is_sequential = False
),
TestTarget('test_ondomatic', \
TestTarget('MoReFEMTestOndomatic', \
('Sources/Test/Ondomatic/demo_input_ondomatic_2D.lua',
'Sources/Test/Ondomatic/demo_input_ondomatic_3D.lua')),
TestTarget('test_domain_list_in_coords', \
TestTarget('MoReFEMTestDomainListInCoords', \
('Sources/Test/Geometry/DomainListInCoords/demo_input_test_domain_list_in_coords.lua', )),
TestTarget('test_lightweight_domain_list', \
TestTarget('MoReFEMTestLightweightDomainList', \
('Sources/Test/Geometry/LightweightDomainList/demo_input_test_lightweight_domain_list.lua', )),
TestTarget('test_coloring', \
TestTarget('MoReFEMTestColoring', \
('Sources/Test/Geometry/Coloring/demo_input_test_coloring.lua', )),
TestTarget('test_coords_in_parallel', \
TestTarget('MoReFEMTestCoordsInParallel', \
('Sources/Test/Geometry/CoordsInParallel/demo_input_test_coords_in_parallel.lua', ),
is_sequential = False),
TestTarget('test_movemesh', \
TestTarget('MoReFEMTestMovemesh', \
('Sources/Test/Geometry/Movemesh/demo_input_parameter_movemesh.lua', )),
TestTarget('test_p1_to_p2', \
TestTarget('MoReFEMTestP1_to_P2', \
('Sources/Test/Operators/P1_to_HigherOrder/demo_input_test_P1_to_P2.lua', )),
TestTarget('test_p1_to_p1b', \
TestTarget('MoReFEMTestP1_to_P1b', \
('Sources/Test/Operators/P1_to_HigherOrder/demo_input_test_P1_to_P1b.lua', )),
TestTarget('test_conform_operator', \
TestTarget('MoReFEMTestConformProjector', \
('Sources/Test/Operators/ConformProjector/demo_input_test_conform_projector.lua', )),
TestTarget('test_vertex_matching_operator', vertex_matching_operator_lua_list),
TestTarget('MoReFEMTestFromVertexMatching', vertex_matching_operator_lua_list),
# TestTarget('test_param_at_dof', \
# ('Sources/Test/Parameter/AtDof/demo_input_test_at_dof_parameter.lua', )),
TestTarget('test_parameter_time_dep', \
TestTarget('MoReFEMTestParameterTimeDependancy', \
('Sources/Test/Parameter/TimeDependency/demo_input_test_parameter_time_dependency.lua', ),
Nproc = 0),
TestTarget('operators_test_functions', \
......@@ -99,23 +99,21 @@ def ModelTargetList():
"""List of all the demonstration model instances to run in the integration process."""
return (\
Target('stokes', \
('Sources/ModelInstances/Stokes/demo_input_stokes.lua', )), \
Target('stokes_2_op', \
('Sources/ModelInstances/Stokes/demo_input_stokes_2_operators.lua', ),
Target('MoReFEM4stokes', \
('Sources/ModelInstances/Stokes/demo_input_stokes.lua', ),
do_call_ensight_output = False), \
Target('elasticity', \
Target('MoReFEM4Elasticity', \
('Sources/ModelInstances/Elasticity/demo_input_elasticity.lua', \
'Sources/ModelInstances/Elasticity/demo_input_elasticity_3d.lua' )), \
Target('midpoint_hyperelasticity', \
Target('MoReFEM4Hyperelasticity', \
('Sources/ModelInstances/Hyperelasticity/demo_input_hyperelasticity.lua', )), \
Target('heat', \
Target('MoReFEM4Heat', \
('Sources/ModelInstances/Heat/demo_input_heat.lua', \
'Sources/ModelInstances/Heat/demo_input_heat_1d.lua')), \
Target('rivlin_cube', \
Target('MoReFEM4RivlinCube', \
('Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua', \
'Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua')), \
Target('laplacian', \
Target('MoReFEM4Laplacian', \
('Sources/ModelInstances/Laplacian/demo_input_laplacian.lua', )), \
)
......@@ -128,12 +126,7 @@ def TestAndModelTargetList():
ret = list(TestTargetList())
ret.extend(ModelTargetList())
ret = (
Target('MoReFEM4RivlinCube', \
('Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_hexahedra.lua', \
'Sources/ModelInstances/RivlinCube/demo_input_rivlin_cube_tetrahedra.lua')), \
)
return ret
......
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