add ctest dependence on cases need particle relaxation

Xiangyu-Hu · Jun 29, 2024 · d2c75f4 · d2c75f4
1 parent 2ff3190
commit d2c75f4
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 7 deletions.
diff --git a/tests/2d_examples/test_2d_collision/CMakeLists.txt b/tests/2d_examples/test_2d_collision/CMakeLists.txt
@@ -21,5 +21,9 @@ target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
 
 add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --relax=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
+
diff --git a/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt b/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt
@@ -25,3 +25,4 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt b/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt
@@ -18,5 +18,6 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt b/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt
@@ -23,6 +23,6 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
-
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt b/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt
@@ -23,6 +23,6 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
-
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_fsi2/CMakeLists.txt b/tests/2d_examples/test_2d_fsi2/CMakeLists.txt
@@ -22,6 +22,7 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_rec
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt b/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt
@@ -23,3 +23,5 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/2d_examples/test_2d_sliding/CMakeLists.txt b/tests/2d_examples/test_2d_sliding/CMakeLists.txt
@@ -19,6 +19,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${DIR_SRCS})
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt b/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt
@@ -20,6 +20,7 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")   
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt b/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt
@@ -25,3 +25,4 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "spatial_temporal_identification diffusion reaction")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt b/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt
@@ -20,6 +20,6 @@ add_test(NAME ${PROJECT_NAME}
 	COMMAND ${PROJECT_NAME}
 	WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "particle relaxation, shell")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "shell")
 
 gtest_discover_tests(${PROJECT_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
diff --git a/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt b/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt
@@ -23,5 +23,5 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
-
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "muscle, diffusion reaction")
+
diff --git a/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt b/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt
@@ -20,4 +20,5 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "
 target_link_libraries(${PROJECT_NAME} sphinxsys_3d)
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}
-    WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+    WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
diff --git a/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt b/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt
@@ -19,7 +19,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${DIR_SRCS})
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary, solid dynamics")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "contact, solid dynamics")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_3d)
diff --git a/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt b/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt
@@ -20,3 +20,4 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt b/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt
@@ -20,6 +20,6 @@ add_test(NAME ${PROJECT_NAME}
 	COMMAND ${PROJECT_NAME}
 	WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "particle relaxation, shell")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "shell")
 
 gtest_discover_tests(${PROJECT_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})