From: Debargha Mukherjee <debargha@google.com>
Date: Thu, 7 Jul 2016 05:55:06 +0000 (+0000)
Subject: Merge "Reinstate tests for wedge partition selection optimizations." into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fabc0ed7ad50cc327243653e20ae4e5538de23d4;p=libvpx

Merge "Reinstate tests for wedge partition selection optimizations." into nextgenv2
---

fabc0ed7ad50cc327243653e20ae4e5538de23d4
diff --cc test/test.mk
index fc9d63559,45ba81ada..28612ef85
--- a/test/test.mk
+++ b/test/test.mk
@@@ -185,12 -185,9 +185,13 @@@ ifeq ($(CONFIG_EXT_INTER),yes
  LIBVPX_TEST_SRCS-$(HAVE_SSSE3) += masked_variance_test.cc
  LIBVPX_TEST_SRCS-$(HAVE_SSSE3) += masked_sad_test.cc
  LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += blend_mask6_test.cc
+ LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += vp10_wedge_utils_test.cc
  endif
  
 +ifeq ($(CONFIG_OBMC),yes)
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += obmc_sad_test.cc
 +endif
 +
  ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
  LIBVPX_TEST_SRCS-$(HAVE_SSE4_1) += vp10_highbd_iht_test.cc
  endif # CONFIG_VP9_HIGHBITDEPTH