From: Yaowu Xu <yaowu@google.com>
Date: Tue, 15 Dec 2015 13:00:05 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b37e8b0e00962bbfda1043647c130fad9283b5fe;p=libvpx

Merge branch 'master' into nextgenv2
---

b37e8b0e00962bbfda1043647c130fad9283b5fe
diff --cc test/test.mk
index 4104fd7fa,80b57e505..471f87021
--- a/test/test.mk
+++ b/test/test.mk
@@@ -170,12 -169,12 +169,17 @@@ LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER
  endif # VP10
  
  ## Multi-codec / unconditional whitebox tests.
+ 
+ ifeq ($(findstring yes,$(CONFIG_VP9_ENCODER)$(CONFIG_VP10_ENCODER)),yes)
+ LIBVPX_TEST_SRCS-yes += avg_test.cc
+ endif
+ 
  LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_txfm_test.h
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm2d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm2d_test.cc
  
  TEST_INTRA_PRED_SPEED_SRCS-yes := test_intra_pred_speed.cc
  TEST_INTRA_PRED_SPEED_SRCS-yes += ../md5_utils.h ../md5_utils.c