Rename rotate tests to include _Opt and disable _Odd tests

unit_test/rotate_argb_test.cc

Index: unit_test/rotate_argb_test.cc
diff --git a/unit_test/rotate_argb_test.cc b/unit_test/rotate_argb_test.cc
index d557a19b367e2050b8039414c282f30aab025c40..24640800a195d0866e28cfa4ac0b031ff814ee69 100644
--- a/unit_test/rotate_argb_test.cc
+++ b/unit_test/rotate_argb_test.cc
@@ -98,62 +98,34 @@ static void ARGBTestRotate(int src_width, int src_height,
                 disable_cpu_flags, benchmark_cpu_info, 4);
 }
 
-TEST_F(LibYUVRotateTest, ARGBRotate0) {
+TEST_F(LibYUVRotateTest, ARGBRotate0_Opt) {
   ARGBTestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, ARGBRotate90) {
+TEST_F(LibYUVRotateTest, ARGBRotate90_Opt) {
   ARGBTestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, ARGBRotate180) {
+TEST_F(LibYUVRotateTest, ARGBRotate180_Opt) {
   ARGBTestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, ARGBRotate270) {
+TEST_F(LibYUVRotateTest, ARGBRotate270_Opt) {
   ARGBTestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate270, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, ARGBRotate0_Odd) {
-  ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
-                 benchmark_width_ - 3, benchmark_height_ - 1,
-                 kRotate0, benchmark_iterations_,
-                 disable_cpu_flags_, benchmark_cpu_info_);
-}
-
-TEST_F(LibYUVRotateTest, ARGBRotate90_Odd) {
-  ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
-                 benchmark_height_ - 1, benchmark_width_ - 3,
-                 kRotate90, benchmark_iterations_,
-                 disable_cpu_flags_, benchmark_cpu_info_);
-}
-
-TEST_F(LibYUVRotateTest, ARGBRotate180_Odd) {
-  ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
-                 benchmark_width_ - 3, benchmark_height_ - 1,
-                 kRotate180, benchmark_iterations_,
-                 disable_cpu_flags_, benchmark_cpu_info_);
-}
-
-TEST_F(LibYUVRotateTest, ARGBRotate270_Odd) {
-  ARGBTestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
-                 benchmark_height_ - 1, benchmark_width_ - 3,
-                 kRotate270, benchmark_iterations_,
-                 disable_cpu_flags_, benchmark_cpu_info_);
-}
-
 static void TestRotatePlane(int src_width, int src_height,
                             int dst_width, int dst_height,
                             libyuv::RotationMode mode,
@@ -166,56 +138,56 @@ static void TestRotatePlane(int src_width, int src_height,
                 disable_cpu_flags, benchmark_cpu_info, 1);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane0) {
+TEST_F(LibYUVRotateTest, RotatePlane0_Opt) {
   TestRotatePlane(benchmark_width_, benchmark_height_,
                   benchmark_width_, benchmark_height_,
                   kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane90) {
+TEST_F(LibYUVRotateTest, RotatePlane90_Opt) {
   TestRotatePlane(benchmark_width_, benchmark_height_,
                   benchmark_height_, benchmark_width_,
                   kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane180) {
+TEST_F(LibYUVRotateTest, RotatePlane180_Opt) {
   TestRotatePlane(benchmark_width_, benchmark_height_,
                   benchmark_width_, benchmark_height_,
                   kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane270) {
+TEST_F(LibYUVRotateTest, RotatePlane270_Opt) {
   TestRotatePlane(benchmark_width_, benchmark_height_,
                   benchmark_height_, benchmark_width_,
                   kRotate270, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane0_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_RotatePlane0_Odd) {
   TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
                   benchmark_width_ - 3, benchmark_height_ - 1,
                   kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane90_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_RotatePlane90_Odd) {
   TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
                   benchmark_height_ - 1, benchmark_width_ - 3,
                   kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane180_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_RotatePlane180_Odd) {
   TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
                   benchmark_width_ - 3, benchmark_height_ - 1,
                   kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, RotatePlane270_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_RotatePlane270_Odd) {
   TestRotatePlane(benchmark_width_ - 3, benchmark_height_ - 1,
                   benchmark_height_ - 1, benchmark_width_ - 3,
                   kRotate270, benchmark_iterations_,