commit 840b2be49151ddbf35baeecc12a6ade213199aa8
author Yunqing Wang <yunqingwang@google.com> Tue Dec 13 15:15:28 2016 -0800
committer Yaowu Xu <yaowu@google.com> Wed Dec 14 01:53:31 2016 +0000
tree b8c78946c2e8dd9d412716b19324e067be416a4a
parent fb9529e1c3c976e3779cd600eb023f5cdea617ca

Modify test.mk

1. The ethread test can only be ran when both the encoder and decoder are
available. This is also true for ext_tile test.
2. Modify the ethread speed test range to speed 0 to 3 for AV1.

BUG=aomedia:117

Change-Id: I3c3e96fb33a7b825503b228fe43e8089e1265dd2

test/ethread_test.cc

diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index 9b58052..68ae42e 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -176,14 +176,15 @@
 // TODO(thdavies): EC_ADAPT does not support tiles
 
 #else
+// For AV1, only test speed 0 to 3.
 AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
                           ::testing::Values(::libaom_test::kTwoPassGood,
                                             ::libaom_test::kOnePassGood),
-                          ::testing::Range(3, 9));
+                          ::testing::Range(2, 4));
 
 AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTestLarge,
                           ::testing::Values(::libaom_test::kTwoPassGood,
                                             ::libaom_test::kOnePassGood),
-                          ::testing::Range(0, 3));
+                          ::testing::Range(0, 2));
 #endif
 }  // namespace

test/test.mk

diff --git a/test/test.mk b/test/test.mk
index d6eefaf..e0cd843 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -36,7 +36,6 @@
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += cpu_speed_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += frame_size_tests.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += lossless_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += ethread_test.cc
 
 LIBAOM_TEST_SRCS-yes                   += decode_test_driver.cc
 LIBAOM_TEST_SRCS-yes                   += decode_test_driver.h
@@ -101,6 +100,10 @@
 LIBAOM_TEST_SRCS-yes                   += partial_idct_test.cc
 LIBAOM_TEST_SRCS-yes                   += superframe_test.cc
 LIBAOM_TEST_SRCS-yes                   += tile_independence_test.cc
+LIBAOM_TEST_SRCS-yes                   += ethread_test.cc
+ifeq ($(CONFIG_EXT_TILE),yes)
+LIBAOM_TEST_SRCS-yes                   += av1_ext_tile_test.cc
+endif
 ifeq ($(CONFIG_ANS),yes)
 LIBAOM_TEST_SRCS-yes                   += ans_test.cc
 else
@@ -150,7 +153,6 @@
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fht32x16_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += fht32x32_test.cc
 endif
-LIBAOM_TEST_SRCS-$(CONFIG_EXT_TILE)     += av1_ext_tile_test.cc
 
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += sum_squares_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += subtract_test.cc