ref: 719f39f44e4a87efc811dcc6a88a6311e36ddb2c
parent: f473e892f7d5234cb4bf599aa07e3037bf43f83b
author: Jim Bankoski <[email protected]>
date: Tue Nov 22 02:31:04 EST 2016
vp9-tests : split VpxEncoderThreadTest into two tests. VpxEncoderThreadTest was taking a very long time for some runs and timing out a lot. This is an attempt to split the test into runs that can be run nightly ( speeds 2 through 9) and runs that can be run weekly ( speeds 0-1 ). Change-Id: Iee6f61a561006d3a30381dd3b52b9a4dce07a70c
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -124,11 +124,31 @@
ASSERT_EQ(single_thr_md5, multi_thr_md5);
}
-VP9_INSTANTIATE_TEST_CASE(VPxEncoderThreadTest,
- ::testing::Values(::libvpx_test::kTwoPassGood,
- ::libvpx_test::kOnePassGood,
- ::libvpx_test::kRealTime),
- ::testing::Range(0, 9), // cpu_used
- ::testing::Range(0, 3), // tile_columns
- ::testing::Range(2, 5)); // threads
+// Split this into two instantiations so that we can distinguish
+// between very slow runs ( ie cpu_speed 0 ) vs ones that can be
+// run nightly by adding Large to the title.
+INSTANTIATE_TEST_CASE_P(
+ VP9, VPxEncoderThreadTest,
+ ::testing::Combine(
+ ::testing::Values(
+ static_cast<const libvpx_test::CodecFactory *>(&libvpx_test::kVP9)),
+ ::testing::Values(::libvpx_test::kTwoPassGood,
+ ::libvpx_test::kOnePassGood,
+ ::libvpx_test::kRealTime),
+ ::testing::Range(2, 9), // cpu_used
+ ::testing::Range(0, 3), // tile_columns
+ ::testing::Range(2, 5))); // threads
+
+INSTANTIATE_TEST_CASE_P(
+ VP9Large, VPxEncoderThreadTest,
+ ::testing::Combine(
+ ::testing::Values(
+ static_cast<const libvpx_test::CodecFactory *>(&libvpx_test::kVP9)),
+ ::testing::Values(::libvpx_test::kTwoPassGood,
+ ::libvpx_test::kOnePassGood,
+ ::libvpx_test::kRealTime),
+ ::testing::Range(0, 2), // cpu_used
+ ::testing::Range(0, 3), // tile_columns
+ ::testing::Range(2, 5))); // threads
+
} // namespace