EC_ADAPT: disable tests requiring tiles.
EC_ADAPT is currently not compatible with tiles.
Change-Id: Idd000f0ff23c28e7e4952024eadb55ba0a1da13d
diff --git a/test/encoder_parms_get_to_decoder.cc b/test/encoder_parms_get_to_decoder.cc
index 52d68b1..e6bf0be 100644
--- a/test/encoder_parms_get_to_decoder.cc
+++ b/test/encoder_parms_get_to_decoder.cc
@@ -49,7 +49,9 @@
{ 0, 0, 0, 1, 0, AOM_CR_STUDIO_RANGE, AOM_CS_BT_601, { 0, 0 } },
{ 0, 0, 0, 0, 0, AOM_CR_FULL_RANGE, AOM_CS_BT_709, { 0, 0 } },
{ 0, 0, 1, 0, 0, AOM_CR_FULL_RANGE, AOM_CS_BT_2020, { 0, 0 } },
+#if !CONFIG_EC_ADAPT
{ 0, 2, 0, 0, 1, AOM_CR_STUDIO_RANGE, AOM_CS_UNKNOWN, { 640, 480 } },
+#endif
// TODO(JBB): Test profiles (requires more work).
};
diff --git a/test/ethread_test.cc b/test/ethread_test.cc
index c256f1f..cc0a9d4 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -119,9 +119,20 @@
// Compare to check if two vectors are equal.
ASSERT_EQ(single_thr_md5, multi_thr_md5);
}
-
+#if CONFIG_EC_ADAPT
+// TODO(thdavies): EC_ADAPT does not support tiles
+INSTANTIATE_TEST_CASE_P(
+ DISABLED_AV1, AVxEncoderThreadTest,
+ ::testing::Combine(
+ ::testing::Values(
+ static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
+ ::testing::Values(::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood),
+ ::testing::Range(1, 3)));
+#else
AV1_INSTANTIATE_TEST_CASE(AVxEncoderThreadTest,
::testing::Values(::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood),
::testing::Range(1, 3));
+#endif
} // namespace
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index 3602f70..0c14d65 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -100,7 +100,16 @@
// a MD5...
ASSERT_STREQ(md5_fw_str, md5_inv_str);
}
-
+#if CONFIG_EC_ADAPT
+// TODO(thdavies): EC_ADAPT does not support tiles
+INSTANTIATE_TEST_CASE_P(
+ DISABLED_AV1, TileIndependenceTest,
+ ::testing::Combine(
+ ::testing::Values(
+ static_cast<const libaom_test::CodecFactory *>(&libaom_test::kAV1)),
+ ::testing::Range(0, 2, 1)));
+#else
AV1_INSTANTIATE_TEST_CASE(TileIndependenceTest, ::testing::Range(0, 2, 1));
+#endif
} // namespace
