Merge pull request RobotLocomotion#3148 from david-german-tri/buildcop

Disable tests affected by RobotLocomotion#3147 except on Linux in Release mode.
Raptura · Aug 16, 2016 · b98cc6b · b98cc6b
2 parents 8dcec09 + ba4f41b
commit b98cc6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/drake/examples/Atlas/CMakeLists.txt b/drake/examples/Atlas/CMakeLists.txt
@@ -32,8 +32,11 @@ add_matlab_test(NAME examples/Atlas/runCOMFixedPointSearch COMMAND runCOMFixedPo
 add_matlab_test(NAME examples/Atlas/runRobotiqPDControl COMMAND runRobotiqPDControl)
 
 if(LONG_RUNNING_TESTS)
-  add_matlab_test(NAME examples/Atlas/runAtlasBalancingPerturb COMMAND runAtlasBalancingPerturb PROPERTIES TIMEOUT 1500 REQUIRES gurobi)
-  add_matlab_test(NAME examples/Atlas/runAtlasManip COMMAND runAtlasManip PROPERTIES TIMEOUT 1500 REQUIRES gurobi)
+
+  if (NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND UNIX AND NOT APPLE) # FIXME: see #3147.
+    add_matlab_test(NAME examples/Atlas/runAtlasBalancingPerturb COMMAND runAtlasBalancingPerturb PROPERTIES TIMEOUT 1500 REQUIRES gurobi)
+    add_matlab_test(NAME examples/Atlas/runAtlasManip COMMAND runAtlasManip PROPERTIES TIMEOUT 1500 REQUIRES gurobi)
+  endif()
 
   # Deactivated due to memory flakiness in instantaneousQP; see #2165, #2376.
   # add_matlab_test(NAME examples/Atlas/runAtlasWalking COMMAND runAtlasWalking PROPERTIES TIMEOUT 1500 REQUIRES gurobi)

diff --git a/drake/examples/Valkyrie/CMakeLists.txt b/drake/examples/Valkyrie/CMakeLists.txt
@@ -1,6 +1,10 @@
 if(LONG_RUNNING_TESTS)
   # add_matlab_test(NAME examples/Valkyrie/runValkyrieBalancing COMMAND runValkyrieBalancing PROPERTIES TIMEOUT 1500)  # FIXME: see #2839
-  add_matlab_test(NAME examples/Valkyrie/runValkyrieBalancingPerturb COMMAND runValkyrieBalancingPerturb PROPERTIES TIMEOUT 1500)
+
+  if (NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND UNIX AND NOT APPLE) # FIXME: see #3147.
+    add_matlab_test(NAME examples/Valkyrie/runValkyrieBalancingPerturb COMMAND runValkyrieBalancingPerturb PROPERTIES TIMEOUT 1500)
+  endif()
+
   # Deactivated due to memory flakiness in instantaneousQP; see #2165, #2376.
   # add_matlab_test(NAME examples/Valkyrie/runValkyrieWalking COMMAND runValkyrieWalking PROPERTIES TIMEOUT 1500)
 endif()