Move ext_inter test sources into encoder group. ext_inter is no longer behind a flag and is part of the standard encoder features. Mix the test sources previously guarded by CONFIG_EXT_INTER into the base encoder test sources list. Change-Id: I80312b669b8c8f4a0decc07b64edb6d165905261
diff --git a/test/test.cmake b/test/test.cmake index 256dad9..062a94c 100644 --- a/test/test.cmake +++ b/test/test.cmake
@@ -219,11 +219,12 @@ "${AOM_ROOT}/test/av1_fht16x16_test.cc" "${AOM_ROOT}/test/av1_fht32x32_test.cc" "${AOM_ROOT}/test/av1_fht8x8_test.cc" - "${AOM_ROOT}/test/av1_inv_txfm_test.cc" "${AOM_ROOT}/test/av1_fwd_txfm1d_test.cc" "${AOM_ROOT}/test/av1_fwd_txfm2d_test.cc" "${AOM_ROOT}/test/av1_inv_txfm1d_test.cc" "${AOM_ROOT}/test/av1_inv_txfm2d_test.cc" + "${AOM_ROOT}/test/av1_inv_txfm_test.cc" + "${AOM_ROOT}/test/av1_wedge_utils_test.cc" "${AOM_ROOT}/test/avg_test.cc" "${AOM_ROOT}/test/blend_a64_mask_1d_test.cc" "${AOM_ROOT}/test/blend_a64_mask_test.cc" @@ -231,6 +232,8 @@ "${AOM_ROOT}/test/fdct4x4_test.cc" "${AOM_ROOT}/test/fdct8x8_test.cc" "${AOM_ROOT}/test/hadamard_test.cc" + "${AOM_ROOT}/test/masked_sad_test.cc" + "${AOM_ROOT}/test/masked_variance_test.cc" "${AOM_ROOT}/test/minmax_test.cc" "${AOM_ROOT}/test/subtract_test.cc" "${AOM_ROOT}/test/sum_squares_test.cc" @@ -255,12 +258,6 @@ endif () endif () - set(AOM_UNIT_TEST_ENCODER_SOURCES - ${AOM_UNIT_TEST_ENCODER_SOURCES} - "${AOM_ROOT}/test/av1_wedge_utils_test.cc" - "${AOM_ROOT}/test/masked_sad_test.cc" - "${AOM_ROOT}/test/masked_variance_test.cc") - if (CONFIG_EXT_TX) set(AOM_UNIT_TEST_ENCODER_SOURCES ${AOM_UNIT_TEST_ENCODER_SOURCES}