From ea0bc1b321f1b8a51e5f5701ac48f597cb417ef3 Mon Sep 17 00:00:00 2001
From: Sarah Parker <sarahparker@google.com>
Date: Wed, 9 Sep 2020 16:10:17 -0700
Subject: [PATCH] Upstream GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST

BUG=b/159031848

Change-Id: I013770f4e54d0ea92304fa3e9cf4d46f5723f129
---
 test/avg_test.cc             | 2 ++
 test/dct16x16_test.cc        | 1 +
 test/fdct8x8_test.cc         | 1 +
 test/lpf_test.cc             | 2 ++
 test/quantize_test.cc        | 1 +
 test/sum_squares_test.cc     | 1 +
 test/variance_test.cc        | 1 +
 test/vp9_block_error_test.cc | 1 +
 test/vp9_denoiser_test.cc    | 1 +
 test/vp9_intrapred_test.cc   | 2 ++
 10 files changed, 13 insertions(+)

diff --git a/test/avg_test.cc b/test/avg_test.cc
index 4bc1944..196522c 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -202,6 +202,7 @@ class IntProRowTest : public AverageTestBase<uint8_t>,
   int16_t *hbuf_asm_;
   int16_t *hbuf_c_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProRowTest);
 
 typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width);
 
@@ -228,6 +229,7 @@ class IntProColTest : public AverageTestBase<uint8_t>,
   int16_t sum_asm_;
   int16_t sum_c_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProColTest);
 #endif  // HAVE_NEON || HAVE_SSE2 || HAVE_MSA
 
 typedef int (*SatdFunc)(const tran_low_t *coeffs, int length);
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index 321c66e..c04880e 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -740,6 +740,7 @@ class InvTrans16x16DCT : public Trans16x16TestBase,
   IdctFunc inv_txfm_;
   int thresh_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InvTrans16x16DCT);
 
 TEST_P(InvTrans16x16DCT, CompareReference) {
   CompareInvReference(ref_txfm_, thresh_);
diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index 770337d..0822666 100644
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -625,6 +625,7 @@ class InvTrans8x8DCT : public FwdTrans8x8TestBase,
   IdctFunc inv_txfm_;
   int thresh_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InvTrans8x8DCT);
 
 TEST_P(InvTrans8x8DCT, CompareReference) {
   CompareInvReference(ref_txfm_, thresh_);
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index 2c632a5..62c6f30 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -145,6 +145,7 @@ class Loop8Test6Param : public ::testing::TestWithParam<loop8_param_t> {
   loop_op_t loopfilter_op_;
   loop_op_t ref_loopfilter_op_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test6Param);
 
 #if HAVE_NEON || HAVE_SSE2 || \
     (HAVE_DSPR2 || HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH)
@@ -166,6 +167,7 @@ class Loop8Test9Param : public ::testing::TestWithParam<dualloop8_param_t> {
   dual_loop_op_t loopfilter_op_;
   dual_loop_op_t ref_loopfilter_op_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Loop8Test9Param);
 #endif  // HAVE_NEON || HAVE_SSE2 || (HAVE_DSPR2 || HAVE_MSA &&
         // (!CONFIG_VP9_HIGHBITDEPTH))
 
diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index b30b90f..792b214 100644
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -146,6 +146,7 @@ class QuantizeTest : public QuantizeTestBase,
   VP8Quantize asm_quant_;
   VP8Quantize c_quant_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(QuantizeTest);
 
 TEST_P(QuantizeTest, TestZeroInput) {
   FillCoeffConstant(0);
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index a47f5b5..df6da84 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -45,6 +45,7 @@ class SumSquaresTest : public ::testing::TestWithParam<SumSquaresParam> {
   SSI16Func ref_func_;
   SSI16Func tst_func_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SumSquaresTest);
 
 TEST_P(SumSquaresTest, OperationCheck) {
   ACMRandom rnd(ACMRandom::DeterministicSeed());
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 72306d9..1b76b20 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -840,6 +840,7 @@ INSTANTIATE_TEST_SUITE_P(
                       MseParams(4, 4, &vpx_highbd_8_mse8x16_c),
                       MseParams(4, 4, &vpx_highbd_8_mse8x8_c)));
 */
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VpxHBDMseTest);
 
 INSTANTIATE_TEST_SUITE_P(
     C, VpxHBDVarianceTest,
diff --git a/test/vp9_block_error_test.cc b/test/vp9_block_error_test.cc
index dc1ff49..b93b014 100644
--- a/test/vp9_block_error_test.cc
+++ b/test/vp9_block_error_test.cc
@@ -67,6 +67,7 @@ class BlockErrorTest : public ::testing::TestWithParam<BlockErrorParam> {
   HBDBlockErrorFunc error_block_op_;
   HBDBlockErrorFunc ref_error_block_op_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlockErrorTest);
 
 TEST_P(BlockErrorTest, OperationCheck) {
   ACMRandom rnd(ACMRandom::DeterministicSeed());
diff --git a/test/vp9_denoiser_test.cc b/test/vp9_denoiser_test.cc
index 3d76edf..d884b7e 100644
--- a/test/vp9_denoiser_test.cc
+++ b/test/vp9_denoiser_test.cc
@@ -51,6 +51,7 @@ class VP9DenoiserTest
  protected:
   BLOCK_SIZE bs_;
 };
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VP9DenoiserTest);
 
 TEST_P(VP9DenoiserTest, BitexactCheck) {
   ACMRandom rnd(ACMRandom::DeterministicSeed());
diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc
index fdcccd5..ccace71 100644
--- a/test/vp9_intrapred_test.cc
+++ b/test/vp9_intrapred_test.cc
@@ -468,6 +468,8 @@ void IntraPredTest<uint16_t, HighbdIntraPredParam>::Predict() {
 }
 
 typedef IntraPredTest<uint16_t, HighbdIntraPredParam> VP9HighbdIntraPredTest;
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VP9HighbdIntraPredTest);
+
 TEST_P(VP9HighbdIntraPredTest, HighbdIntraPredTests) {
   // max block size is 32
   DECLARE_ALIGNED(16, uint16_t, left_col[2 * 32]);
-- 
2.7.4