commit ce4bcebed2f7ba4003e9ddf78ea266cc5c815e64
author Tom Finegan <tomfinegan@google.com> Fri Feb 03 11:02:53 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Tue Feb 07 16:33:48 2017 +0000
tree b9a5f29c11b6144bb3386e19e9e5d7c63c80d0fc
parent e93acb2d228ce2d97214703e24e1a955611d5a94

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

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5089e41..a5adb8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,8 +612,9 @@
     #"${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"

test/obmc_sad_test.cc

diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 5ebd62c..1814cdd 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -169,6 +169,7 @@
 }
 
 #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 @@
 
 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

test/obmc_variance_test.cc

diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index 524d513..41e399a 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -183,6 +183,7 @@
 }
 
 #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 @@
 
 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