Skip to content

Replace OpenSimAddTests macro with equivalent OpenSimAddTest for individual tests #4466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nickbianco wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replace OpenSimAddTests macro with equivalent OpenSimAddTest for individual tests #4466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
813a9e3
Replace OpenSimAddTests with OpenSimAddTest
nickbianco Sep 30, 2026
fca489e
Symlink resources instead of copy in OpenSimAddTest
nickbianco Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 84 additions & 10 deletions Applications/Analyze/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,90 @@
find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot)
OpenSimAddTest(NAME testAnalyzeTool
LINKLIBS osimTools
RESOURCES resources/BothLegs.osim
resources/PlotterTool.xml
resources/Tug_of_War_ConstantVelocity.sto
resources/Tug_of_War_ConstantVelocity_RampActivation.sto
resources/Tug_of_War_Millard_Iso.osim
resources/Tug_of_War_Setup_Analyze.xml
resources/double_pendulum.osim
resources/double_pendum1sec.sto
resources/plotterGeneratedStates.sto
resources/plotterGeneratedStatesHip45.sto
resources/std_BothLegsHip45__FiberLength.sto
resources/std_BothLegs_fiberLength.sto
)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testInducedAccelerations
LINKLIBS osimTools
RESOURCES resources/double_pendulum.osim
resources/double_pendulum_Setup_IAA.xml
resources/double_pendulum_states.sto
resources/gait2392_CMC_Actuators_232.xml
resources/pendulum_controls.xml
resources/std_subject02_running_arms_InducedAccelerations_CENTER_OF_MASS.sto
resources/subject02_Setup_IAA_02_232.xml
resources/subject02_grf_HiFreq.mot
resources/subject02_grf_HiFreq.xml
resources/subject02_running_CMC_controls.xml
resources/subject02_running_CMC_states.sto
resources/subject02_running_RRA_cycle02_sim02_07_v232.osim
)

OpenSimAddTest(NAME testJointReactions
LINKLIBS osimTools
RESOURCES resources/DoublePendulum3D.osim
resources/DoublePendulum3D_Setup_JointReaction.xml
resources/DoublePendulum3D_states_degrees.mot
resources/SinglePin.osim
resources/SinglePin_Setup_JointReaction.xml
resources/SinglePin_Setup_JointReaction_FrameKeyword.xml
resources/SinglePin_states.sto
resources/std_DoublePendulum3D_JointReaction_ReactionLoads.sto
resources/std_DoublePendulum3D_JointReaction_ReactionLoads_FrameKeyword.sto
resources/std_SinglePin_JointReaction_ReactionLoads.sto
resources/std_SinglePin_JointReaction_ReactionLoads_FrameKeyword.sto
)

OpenSimAddTest(NAME testPointKinematics
LINKLIBS osimTools
RESOURCES resources/SinglePin.osim
resources/subject01.osim
resources/subject01_walk1_ik.mot
)

OpenSimAddTest(NAME testStaticOptimization
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_InverseKinematics.mot
resources/arm26_Setup_StaticOptimization.xml
resources/arm26_bounds.osim
resources/arm26_bounds_Setup_StaticOptimization.xml
resources/externalForces.xml
resources/gait10dof_Actuators_weak.xml
resources/staticoptimization_spring_Setup.xml
resources/std_Millard2012EquilibriumMuscle_arm26_StaticOptimization_activation.sto
resources/std_Millard2012EquilibriumMuscle_arm26_StaticOptimization_force.sto
resources/std_Millard2012EquilibriumMuscle_arm26_bounds_StaticOptimization_activation.sto
resources/std_Millard2012EquilibriumMuscle_arm26_bounds_StaticOptimization_force.sto
resources/std_Thelen2003Muscle_Deprecated_arm26_StaticOptimization_activation.sto
resources/std_Thelen2003Muscle_Deprecated_arm26_StaticOptimization_force.sto
resources/std_Thelen2003Muscle_Deprecated_arm26_bounds_StaticOptimization_activation.sto
resources/std_Thelen2003Muscle_Deprecated_arm26_bounds_StaticOptimization_force.sto
resources/std_Thelen2003Muscle_arm26_StaticOptimization_activation.sto
resources/std_Thelen2003Muscle_arm26_StaticOptimization_force.sto
resources/std_Thelen2003Muscle_arm26_bounds_StaticOptimization_activation.sto
resources/std_Thelen2003Muscle_arm26_bounds_StaticOptimization_force.sto
resources/std_walk_subject01_ankle_spring_StaticOptimization_activation.sto
resources/std_walk_subject01_ankle_spring_StaticOptimization_force.sto
resources/subject01.osim
resources/subject01_Setup_StaticOptimization.xml
resources/subject01_adjusted_spring.osim
resources/subject01_walk1_grf.mot
resources/subject01_walk1_ik.mot
resources/walk_subject01_Kinematics_q.sto
)

file(COPY "resources/UsingRelativePaths" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
140 changes: 128 additions & 12 deletions Applications/CMC/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,131 @@
find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot
resources/*.vtp)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testCMCArm26_Millard
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_ComputedMuscleControl_Tasks.xml
resources/arm26_InverseKinematics.mot
resources/arm26_Reserve_Actuators.xml
resources/arm26_Setup_CMC.xml
resources/std_arm26_states.sto
)

OpenSimAddTest(NAME testCMCArm26_Thelen
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_ComputedMuscleControl_Tasks.xml
resources/arm26_InverseKinematics.mot
resources/arm26_Reserve_Actuators.xml
resources/arm26_Setup_CMC.xml
resources/std_arm26_states.sto
)

OpenSimAddTest(NAME testCMCEMGDrivenArm_Millard
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_ComputedMuscleControl_Tasks_EMG.xml
resources/arm26_InverseKinematics.mot
resources/arm26_Reserve_Actuators.xml
resources/arm26_Setup_ComputedMuscleControl_EMG.xml
resources/muscle_emg.sto
resources/std_arm26_states.sto
)

OpenSimAddTest(NAME testCMCEMGDrivenArm_Thelen
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_ComputedMuscleControl_Tasks_EMG.xml
resources/arm26_InverseKinematics.mot
resources/arm26_Reserve_Actuators.xml
resources/arm26_Setup_ComputedMuscleControl_EMG.xml
resources/muscle_emg.sto
resources/std_arm26_states.sto
)

OpenSimAddTest(NAME testCMCGait10dof18musc
LINKLIBS osimTools
RESOURCES resources/gait10dof18musc_Setup_CMC.xml
resources/gait10dof18musc_std_walk_subject_states_unix.sto
resources/gait10dof18musc_subject01.osim
resources/gait10dof18musc_subject01_walk_grf.mot
resources/gait10dof18musc_subject01_walk_grf.xml
resources/gait10dof18musc_subject_adjusted_Kinematics_q.sto
resources/gait10dof_Kinematics_Tracking_Tasks.xml
resources/gait10dof_Reserve_Actuators.xml
)

OpenSimAddTest(NAME testCMCLeg6Dof9Musc
LINKLIBS osimTools
RESOURCES resources/Leg6Dof9MuscSwing_std_leg6dof9musc_states.sto
resources/leg69_CMC_Swing_Tracking_Tasks.xml
resources/leg69_CMC_residuals_motors.xml
resources/leg69_IK_stance.mot
resources/leg69_IK_swing.mot
resources/leg69_Setup_CMC_Stance.xml
resources/leg69_Tracking_Tasks.xml
resources/leg69_muscles_control_limits.xml
resources/leg69_muscles_residuals_motor_control_limits.xml
resources/leg69_right_grf.xml
resources/leg69_stance_grf.mot
resources/leg6dof9musc.osim
resources/leg6dof9musc_added_mass.osim
resources/leg6dof9musc_adjusted_Kinematics_q.sto
resources/leg6dof9musc_setup_Swing.xml
resources/leg6dof9musc_std_RRA_adjusted_states.sto
)

OpenSimAddTest(NAME testCMCSingleMuscle
LINKLIBS osimTools
RESOURCES resources/block_hanging_from_muscle.osim
resources/block_hanging_from_muscle_CMC_Tasks.xml
resources/block_hanging_from_muscle_Setup_CMC.xml
resources/block_hanging_from_muscle_Setup_Forward.xml
resources/block_hanging_from_muscle_controls.sto
)

OpenSimAddTest(NAME testCMCSingleRigidTendonMuscle
LINKLIBS osimTools
RESOURCES resources/block_hanging_from_muscle.osim
resources/block_hanging_from_muscle_CMC_Tasks.xml
resources/block_hanging_from_muscle_Setup_CMC.xml
resources/block_hanging_from_muscle_Setup_Forward.xml
resources/block_hanging_from_muscle_controls.sto
)

OpenSimAddTest(NAME testCMCTwoMusclesOnBlock
LINKLIBS osimTools
RESOURCES resources/anchor1.vtp
resources/anchor2.vtp
resources/block.vtp
resources/twoMusclesOnBlock.osim
resources/twoMusclesOnBlock_CMC_Tasks.xml
resources/twoMusclesOnBlock_Setup_CMC.xml
resources/twoMusclesOnBlock_Setup_Forward.xml
)

OpenSimAddTest(NAME testCMCWithControlConstraintsGait2354
LINKLIBS osimTools
RESOURCES resources/gait2354_CMC_Actuators.xml
resources/gait2354_CMC_ControlConstraints.xml
resources/gait2354_CMC_Tasks.xml
resources/std_subject01_walk1_states_WithControlConstraints.sto
resources/subject01_Setup_CMC.xml
resources/subject01_externalForces.xml
resources/subject01_simbody_adjusted.osim
resources/subject01_walk1_RRA_Kinematics_initial_q.sto
resources/subject01_walk1_grf.mot
)

OpenSimAddTest(NAME testCMCWithControlConstraintsRunningModel
LINKLIBS osimTools
RESOURCES resources/runningModel_CMC_Actuators.xml
resources/runningModel_CMC_Tasks.xml
resources/runningModel_CMC_test.osim
resources/runningModel_ControlConstraints.xml
resources/runningModel_GRF.xml
resources/runningModel_GRF_data.mot
resources/runningModel_Kinematics_q.sto
resources/runningModel_Setup_CMC_test.xml
resources/std_runningModel_CMC_states.sto
)
36 changes: 25 additions & 11 deletions Applications/Forward/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testForward
LINKLIBS osimTools
RESOURCES resources/arm26.osim
resources/arm26_InitialStates.sto
resources/arm26_Setup_Forward.xml
resources/arm26_StaticOptimization_controls.xml
resources/gait2354_CMC_Actuators.xml
resources/pendulum.osim
resources/pendulum_Setup_Forward.xml
resources/pendulum_ext_gravity_Setup_Forward.xml
resources/pendulum_ext_point_in_ground_Setup_Forward.xml
resources/pendulum_external_load.sto
resources/pendulum_external_load.xml
resources/pendulum_external_load_point_in_ground.sto
resources/pendulum_external_load_point_in_ground.xml
resources/pendulum_no_gravity.osim
resources/std_arm26_states.sto
resources/std_subject01_walk1_states.sto
resources/subject01_GRFs.xml
resources/subject01_Setup_Forward.xml
resources/subject01_Setup_Forward_Controller.xml
resources/subject01_adjusted.osim
resources/subject01_walk1_controls.xml
resources/subject01_walk1_grf.mot
)
28 changes: 16 additions & 12 deletions Applications/ID/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot)
list(APPEND TEST_FILES ${CMAKE_SOURCE_DIR}/OpenSim/Tests/shared/ThoracoscapularShoulderModel.osim)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testID
LINKLIBS osimTools
RESOURCES "${CMAKE_SOURCE_DIR}/OpenSim/Tests/shared/ThoracoscapularShoulderModel.osim"
resources/ThorascapularShoulderModel_ID_static.xml
resources/ThorascapularShoulderModel_static.mot
resources/arm26.osim
resources/arm26_InverseKinematics.mot
resources/arm26_Setup_InverseDynamics.xml
resources/std_arm26_InverseDynamics.sto
resources/std_subject01_InverseDynamics.sto
resources/subject01.osim
resources/subject01_Setup_InverseDynamics.xml
resources/subject01_walk1_grf.mot
resources/subject01_walk1_grf.xml
resources/subject01_walk1_ik.mot
)
32 changes: 21 additions & 11 deletions Applications/IK/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot
resources/*.trc)
OpenSimAddTest(NAME testIK
LINKLIBS osimTools
RESOURCES resources/abdbonepin.trc
resources/constraintTest.trc
resources/constraintTest_ikOnly.osim
resources/constraintTest_setup_ik.xml
resources/gait2354_IK_Tasks_uniform.xml
resources/setup_ik_abdbonepin.xml
resources/std_subject01_walk1_ik.mot
resources/std_subject1_abdbonepin_IK.mot
resources/subject01_Setup_InverseKinematics.xml
resources/subject01_Setup_InverseKinematics_NoModel.xml
resources/subject01_simbody.osim
resources/subject01_synthetic_marker_data.trc
resources/subject1_abdbonepin.osim
)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testLiveIK
LINKLIBS osimTools
RESOURCES resources/std_subject01_walk1_ik.mot
resources/subject01_simbody.osim
)
25 changes: 13 additions & 12 deletions Applications/RRA/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@

find_package(Catch2 REQUIRED
HINTS "${OPENSIM_DEPENDENCIES_DIR}/catch2")

file(GLOB TEST_PROGS "test*.cpp")
file(GLOB TEST_FILES resources/*.osim
resources/*.xml
resources/*.sto
resources/*.mot)

OpenSimAddTests(
TESTPROGRAMS ${TEST_PROGS}
DATAFILES ${TEST_FILES}
LINKLIBS osimTools Catch2::Catch2WithMain
)
OpenSimAddTest(NAME testRRA
LINKLIBS osimTools
RESOURCES resources/gait2354_RRA_Actuators.xml
resources/gait2354_RRA_ControlConstraints.xml
resources/gait2354_RRA_Tasks.xml
resources/subject01_RRA_adjusted.osim
resources/subject01_Setup_RRA.xml
resources/subject01_externalForces.xml
resources/subject01_simbody.osim
resources/subject01_walk1_RRA_Kinematics_q_standard.sto
resources/subject01_walk1_grf.mot
resources/subject01_walk1_ik.mot
)
Loading
Loading