ref: fb1a8ba35a19c9295b48e1c63e60da0ad63cbdab
parent: 15de7bd3344910c70a93c36bc4d3b71f65d79aa5
parent: 463c94854f6a4ee9043d81626b593478319d33c0
author: Jingning Han <jingning@google.com>
date: Thu Aug 6 15:50:23 EDT 2015
Merge "Fix compiler error in vp8/9 decoder test"
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -135,6 +135,7 @@
// Test VP8 decode in serial mode with single thread.
// NOTE: VP8 only support serial mode.
+#if CONFIG_VP8_DECODER
VP8_INSTANTIATE_TEST_CASE(
TestVectorTest,
::testing::Combine(
@@ -143,8 +144,10 @@
::testing::ValuesIn(libvpx_test::kVP8TestVectors,
libvpx_test::kVP8TestVectors +
libvpx_test::kNumVP8TestVectors)));
+#endif // CONFIG_VP8_DECODER
// Test VP9 decode in serial mode with single thread.
+#if CONFIG_VP9_DECODER
VP9_INSTANTIATE_TEST_CASE(
TestVectorTest,
::testing::Combine(
@@ -154,8 +157,6 @@
libvpx_test::kVP9TestVectors +
libvpx_test::kNumVP9TestVectors)));
-
-#if CONFIG_VP9_DECODER
// Test VP9 decode in frame parallel mode with different number of threads.
INSTANTIATE_TEST_CASE_P(
VP9MultiThreadedFrameParallel, TestVectorTest,