Merge "Move #if out of TEST_P in vp10_fwd/inv_txfm2d_test.cc" into nextgenv2

test/vp10_fwd_txfm2d_test.cc

@@ -132,10 +132,7 @@ class VP10FwdTxfm2d : public ::testing::TestWithParam<VP10FwdTxfm2dParam> {
 TEST_P(VP10FwdTxfm2d, RunFwdAccuracyCheck) {
   RunFwdAccuracyCheck();
 }
-
-INSTANTIATE_TEST_CASE_P(
-    C, VP10FwdTxfm2d,
-    ::testing::Values(
+const VP10FwdTxfm2dParam vp10_fwd_txfm2d_param_c[] = {
 #if CONFIG_EXT_TX
   VP10FwdTxfm2dParam(FLIPADST_DCT,  TX_4X4, 2, 0.2),
   VP10FwdTxfm2dParam(DCT_FLIPADST,  TX_4X4, 2, 0.2),
@@ -173,7 +170,12 @@ INSTANTIATE_TEST_CASE_P(
   VP10FwdTxfm2dParam(DCT_DCT,   TX_32X32, 70, 7),
   VP10FwdTxfm2dParam(ADST_DCT,  TX_32X32, 70, 7),
   VP10FwdTxfm2dParam(DCT_ADST,  TX_32X32, 70, 7),
-        VP10FwdTxfm2dParam(ADST_ADST, TX_32X32, 70, 7)));
-#endif  // CONFIG_VP9_HIGHBITDEPTH
+  VP10FwdTxfm2dParam(ADST_ADST, TX_32X32, 70, 7)
+};
 
+INSTANTIATE_TEST_CASE_P(
+    C, VP10FwdTxfm2d,
+    ::testing::ValuesIn(vp10_fwd_txfm2d_param_c));
+
+#endif  // CONFIG_VP9_HIGHBITDEPTH
 }  // namespace

test/vp10_inv_txfm2d_test.cc

@@ -108,9 +108,7 @@ class VP10InvTxfm2d : public ::testing::TestWithParam<VP10InvTxfm2dParam> {
 
 TEST_P(VP10InvTxfm2d, RunRoundtripCheck) { RunRoundtripCheck(); }
 
-INSTANTIATE_TEST_CASE_P(
-    C, VP10InvTxfm2d,
-    ::testing::Values(
+const VP10InvTxfm2dParam vp10_inv_txfm2d_param[] = {
 #if CONFIG_EXT_TX
   VP10InvTxfm2dParam(FLIPADST_DCT, TX_4X4, 2, 0.002),
   VP10InvTxfm2dParam(DCT_FLIPADST, TX_4X4, 2, 0.002),
@@ -148,7 +146,12 @@ INSTANTIATE_TEST_CASE_P(
   VP10InvTxfm2dParam(DCT_DCT, TX_32X32, 4, 0.4),
   VP10InvTxfm2dParam(ADST_DCT, TX_32X32, 4, 0.4),
   VP10InvTxfm2dParam(DCT_ADST, TX_32X32, 4, 0.4),
-        VP10InvTxfm2dParam(ADST_ADST, TX_32X32, 4, 0.4)));
+  VP10InvTxfm2dParam(ADST_ADST, TX_32X32, 4, 0.4)
+};
+
+INSTANTIATE_TEST_CASE_P(
+    C, VP10InvTxfm2d,
+    ::testing::ValuesIn(vp10_inv_txfm2d_param));
 
 #endif  // CONFIG_VP9_HIGHBITDEPTH