Skip to content
Snippets Groups Projects
Commit fe82f974 authored by mnaveau's avatar mnaveau
Browse files

Merge branch 'devel' of github.com:jrl-umi3218/jrl-walkgen into devel 

Conflicts:
	tests/CMakeLists.txt
parents 17aa7e1c bde8c5e9
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1 deletion
tests/CMakeLists.txt
+ 7
− 1
View file @ fe82f974
......@@ -152,6 +152,12 @@ ENDMACRO(ADD_JRL_WALKGEN_EXE)
# the following disabled test case are just useful code for offline
# motion generation using the specialized inverse kinmatics of a robot
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007ShortWalk TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007Climbing TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007GoingDown TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007SteppingStones TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007WalkingOnBeam TestMorisawa2007.cpp)
#ADD_JRL_WALKGEN_TEST(TestMorisawa2007GoThroughWall TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007ShortWalk TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007Climbing TestMorisawa2007.cpp)
ADD_JRL_WALKGEN_EXE(TestMorisawa2007GoingDown TestMorisawa2007.cpp)
......@@ -208,7 +214,7 @@ ADD_JRL_WALKGEN_EXE(TestMorisawa2007GoThroughWall TestMorisawa2007.cpp)
################
# Disabled as the test fail : random results oscillating around mean behaviour
ADD_JRL_WALKGEN_TEST(TestNaveau2015Online TestNaveau2015.cpp)
#ADD_JRL_WALKGEN_TEST(TestNaveau2015Online TestNaveau2015.cpp)
ADD_JRL_WALKGEN_EXE(TestNaveau2015Online TestNaveau2015.cpp)
#####################
......
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