diff options
| author | James Bankoski <jimbankoski@google.com> | 2016-11-22 19:34:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-22 19:34:16 +0000 |
| commit | 4bb01229cd5385f316070b527434476767159bd3 (patch) | |
| tree | fe4cf04b8d692bfe00618861cf2ce7eb6454227b | |
| parent | ecc5998bcf59044688d92c89d73e8b5247c02955 (diff) | |
| parent | 719f39f44e4a87efc811dcc6a88a6311e36ddb2c (diff) | |
| download | libvpx-4bb01229cd5385f316070b527434476767159bd3.tar libvpx-4bb01229cd5385f316070b527434476767159bd3.tar.gz libvpx-4bb01229cd5385f316070b527434476767159bd3.tar.bz2 libvpx-4bb01229cd5385f316070b527434476767159bd3.zip | |
Merge "vp9-tests : split VpxEncoderThreadTest into two tests."
| -rw-r--r-- | test/vp9_ethread_test.cc | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/test/vp9_ethread_test.cc b/test/vp9_ethread_test.cc index f89f852b6..4df40854b 100644 --- a/test/vp9_ethread_test.cc +++ b/test/vp9_ethread_test.cc @@ -124,11 +124,31 @@ TEST_P(VPxEncoderThreadTest, EncoderResultTest) { 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 |