Merge pull request RobotLocomotion#6292 from m-chaturvedi/increasing_…

…timeouts_for_bazel_valgrind Increasing Bazel Timeouts For Valgrind
trigrass2 · Jun 9, 2017 · 14a0e6b · 14a0e6b
2 parents a5d1dce + 8b6b208
commit 14a0e6b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/drake/common/trajectories/BUILD b/drake/common/trajectories/BUILD
@@ -85,6 +85,8 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "piecewise_generation_test",
+    # Test size increased to not timeout when run with Valgrind.
+    size = "medium",
     srcs = ["test/piecewise_polynomial_generation_test.cc"],
     deps = [
         ":piecewise_polynomial",

diff --git a/drake/solvers/BUILD b/drake/solvers/BUILD
@@ -702,9 +702,8 @@ drake_cc_googletest(
 drake_cc_googletest(
     name = "system_identification_test",
     # The test takes ~20 sec in opt mode but ~140 sec in dbg mode.
-    # To avoid timeouts in dbg or valgrind, we need "moderate" here.
-    # TODO(bazelbuild/bazel#1748) This produces a spurious complaint.
-    timeout = "moderate",
+    # To avoid timeouts in dbg and valgrind, we need "large" here.
+    size = "large",
     deps = [
         ":system_identification",
         "//drake/common:eigen_matrix_compare",

diff --git a/drake/systems/analysis/BUILD b/drake/systems/analysis/BUILD
@@ -179,6 +179,8 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "implicit_euler_integrator_test",
+    # Test size increased to not timeout when run with Valgrind.
+    size = "medium",
     deps = [
         ":discontinuous_spring_mass_damper_system",
         ":implicit_euler_integrator",
@@ -199,6 +201,8 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "runge_kutta3_integrator_test",
+    # Test size increased to not timeout when run with Valgrind.
+    size = "medium",
     deps = [
         ":my_spring_mass_system",
         ":runge_kutta3_integrator",
@@ -211,6 +215,8 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "semi_explicit_euler_integrator_test",
+    # Test size increased to not timeout when run with Valgrind.
+    size = "medium",
     deps = [
         ":explicit_euler_integrator",
         ":my_spring_mass_system",

diff --git a/drake/systems/trajectory_optimization/BUILD b/drake/systems/trajectory_optimization/BUILD
@@ -46,6 +46,8 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "trajectory_optimization_test",
+    # Test size increased to not timeout when run with Valgrind.
+    size = "medium",
     deps = [
         ":direct_collocation",
         "//drake/common:eigen_matrix_compare",