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

diff --cc test/test.mk
index fc9d6355982b1fc878e7c9d0aeecffff54fc1b2b,45ba81ada9c6642630248c3b7622de57e5097a54..28612ef857dde8d2593b0d932f9c04508a5faca7
--- 1/test/test.mk
--- 2/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