Turn on ActiveMapTest speeds [0,5) with all experiments.

Change-Id: I7da9e6a85648aa69e5e20d825b717d51e3c6809c

diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index ab01df44f320043491a24173c41b40e4866240f1..9d953a8427c7fcf48f78fb34a4e39466085aee99 100644 (file)
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -88,25 +88,21 @@ VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
                           ::testing::Range(0, 9));
 #if CONFIG_VP10
 #if CONFIG_SUPERTX
+VP10_INSTANTIATE_TEST_CASE(ActiveMapTest,
+                           ::testing::Values(::libvpx_test::kRealTime),
+                           ::testing::Range(0, 5));
+// SuperTx and ActiveMap don't get along at speed 5.
+// https://bugs.chromium.org/p/webm/issues/detail?id=1234
 INSTANTIATE_TEST_CASE_P(
     DISABLED_VP10, ActiveMapTest,
     ::testing::Combine(
         ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
             &libvpx_test::kVP10)),
-        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(0, 9)));
+        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 9)));
 #else
 VP10_INSTANTIATE_TEST_CASE(ActiveMapTest,
                            ::testing::Values(::libvpx_test::kRealTime),
-                           ::testing::Range(0, 6));
-
-// The new variance based partitioning scheme is incompatible with
-// SEGMENT_LEVEL_SKIP.
-INSTANTIATE_TEST_CASE_P(
-    DISABLED_VP10, ActiveMapTest,
-    ::testing::Combine(
-        ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
-            &libvpx_test::kVP10)),
-        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(6, 9)));
+                           ::testing::Range(0, 9));
 #endif  // CONFIG_SUPERTX
 #endif  // CONFIG_VP10
 }  // namespace