commit 086c9db8e02221b2b0a9399eb34e893effa6c5b7
author Alex Converse <aconverse@google.com> Wed Jan 25 17:56:36 2017 -0800
committer Alex Converse <aconverse@google.com> Thu Jan 26 18:50:04 2017 +0000
tree 37c962b64eda9a71323aedd8aecd64777d09a86f
parent 56ba91bbe4470411ea2c6c20dc8bc2f76f5f92db

Remove "Large" from most of AV1FrameSizeTests

The only test here that is truly Large is ValidSizes (now
LargeValidSizes)

Change-Id: If0893aad78a666f3db0581a79d6161cc8929a996

test/frame_size_tests.cc

diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index d9d3a0f..3d0ce9c 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -15,12 +15,12 @@
 
 namespace {
 
-class AV1FrameSizeTestsLarge : public ::libaom_test::EncoderTest,
-                               public ::testing::Test {
+class AV1FrameSizeTests : public ::libaom_test::EncoderTest,
+                          public ::testing::Test {
  protected:
-  AV1FrameSizeTestsLarge()
+  AV1FrameSizeTests()
       : EncoderTest(&::libaom_test::kAV1), expected_res_(AOM_CODEC_OK) {}
-  virtual ~AV1FrameSizeTestsLarge() {}
+  virtual ~AV1FrameSizeTests() {}
 
   virtual void SetUp() {
     InitializeConfig();
@@ -46,7 +46,7 @@
   int expected_res_;
 };
 
-TEST_F(AV1FrameSizeTestsLarge, TestInvalidSizes) {
+TEST_F(AV1FrameSizeTests, TestInvalidSizes) {
   ::libaom_test::RandomVideoSource video;
 
 #if CONFIG_SIZE_LIMIT
@@ -57,7 +57,7 @@
 #endif
 }
 
-TEST_F(AV1FrameSizeTestsLarge, ValidSizes) {
+TEST_F(AV1FrameSizeTests, LargeValidSizes) {
   ::libaom_test::RandomVideoSource video;
 
 #if CONFIG_SIZE_LIMIT
@@ -84,7 +84,13 @@
 #endif
 }
 
-TEST_F(AV1FrameSizeTestsLarge, OneByOneVideo) {
+#if CONFIG_LOOP_RESTORATION
+// https://bugs.chromium.org/p/aomedia/issues/detail?id=312
+#define ONE_BY_ONE_VIDEO_NAME DISABLED_OneByOneVideo
+#else
+#define ONE_BY_ONE_VIDEO_NAME OneByOneVideo
+#endif
+TEST_F(AV1FrameSizeTests, ONE_BY_ONE_VIDEO_NAME) {
   ::libaom_test::RandomVideoSource video;
 
   video.SetSize(1, 1);
@@ -92,4 +98,5 @@
   expected_res_ = AOM_CODEC_OK;
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
+#undef ONE_BY_ONE_VIDEO_NAME
 }  // namespace