ref: 675ec943db9a8f6df005c3824431142ccaacb2c2
parent: 60e9b731cf8945403dbcf149a0f6dc745e5cabe1
author: Frank Galligan <fgalligan@google.com>
date: Thu Dec 18 11:03:27 EST 2014
Fix including test file twice. The test file niklas_1280_720_30.yuv may be included twice. Change-Id: I44512073e9e430a8e10fbce5afd62041e0edea17
--- a/test/test-data.mk
+++ b/test/test-data.mk
@@ -715,7 +715,9 @@
ifeq ($(CONFIG_DECODE_PERF_TESTS),yes)
# NewEncode Test
+ifneq ($(CONFIG_VP9_ENCODER),yes)
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += niklas_1280_720_30.yuv
+endif
# BBB VP9 streams
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-bbb_426x240_tile_1x1_180kbps.webm
LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp90-2-bbb_640x360_tile_1x2_337kbps.webm
@@ -745,9 +747,6 @@
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += kirland_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += macmarcomoving_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += macmarcostationary_640_480_30.yuv
-ifneq ($(CONFIG_DECODE_PERF_TESTS),yes)
-LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_1280_720_30.yuv
-endif
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += niklas_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += tacomanarrows_640_480_30.yuv
LIBVPX_TEST_DATA-$(CONFIG_VP9_ENCODER) += tacomasmallcameramovement_640_480_30.yuv