Commit ce4bcebe authored by Tom Finegan's avatar Tom Finegan

Fix cmake test_libaom build with CONFIG_AOM_HIGHBITDEPTH enabled.

- Comment out the sources that require CONFIG_MOTION_VAR.
- Add missing preproc wrap at the sites in test sources that
  require CONFIG_MOTION_VAR.

Change-Id: I703c2bfd829a579793ad55ae713973d327354473
parent e93acb2d
......@@ -612,8 +612,9 @@ set(AOM_UNIT_TEST_SOURCES
#"${AOM_ROOT}/test/masked_variance_test.cc"
"${AOM_ROOT}/test/md5_helper.h"
"${AOM_ROOT}/test/minmax_test.cc"
"${AOM_ROOT}/test/obmc_sad_test.cc"
"${AOM_ROOT}/test/obmc_variance_test.cc"
# requires CONFIG_MOTION_VAR
#"${AOM_ROOT}/test/obmc_sad_test.cc"
#"${AOM_ROOT}/test/obmc_variance_test.cc"
"${AOM_ROOT}/test/partial_idct_test.cc"
# omitted from tests.mk, includes vp8 file.
#"${AOM_ROOT}/test/quantize_test.cc"
......
......@@ -169,6 +169,7 @@ TEST_P(ObmcSadHBDTest, ExtremeValues) {
}
#if HAVE_SSE4_1
#if CONFIG_MOTION_VAR
ObmcSadHBDTest::ParamType sse4_functions_hbd[] = {
#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_sad128x128_c, aom_highbd_obmc_sad128x128_sse4_1),
......@@ -192,6 +193,7 @@ ObmcSadHBDTest::ParamType sse4_functions_hbd[] = {
INSTANTIATE_TEST_CASE_P(SSE4_1, ObmcSadHBDTest,
::testing::ValuesIn(sse4_functions_hbd));
#endif // CONFIG_MOTION_VAR
#endif // HAVE_SSE4_1
#endif // CONFIG_AOM_HIGHBITDEPTH
} // namespace
......@@ -183,6 +183,7 @@ TEST_P(ObmcVarianceHBDTest, ExtremeValues) {
}
#if HAVE_SSE4_1
#if CONFIG_MOTION_VAR
ObmcVarianceHBDTest::ParamType sse4_functions_hbd[] = {
#if CONFIG_EXT_PARTITION
TestFuncs(aom_highbd_obmc_variance128x128_c,
......@@ -290,6 +291,7 @@ ObmcVarianceHBDTest::ParamType sse4_functions_hbd[] = {
INSTANTIATE_TEST_CASE_P(SSE4_1, ObmcVarianceHBDTest,
::testing::ValuesIn(sse4_functions_hbd));
#endif // CONFIG_MOTION_VAR
#endif // HAVE_SSE4_1
#endif // CONFIG_AOM_HIGHBITDEPTH
} // namespace
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment