Rename rotate tests to include _Opt and disable _Odd tests

unit_test/rotate_test.cc

Index: unit_test/rotate_test.cc
diff --git a/unit_test/rotate_test.cc b/unit_test/rotate_test.cc
index c97cc208bb4c401d6f610c553020f78bce8dbdc4..b7957aa96118d45514da094a352364393e8efbca 100644
--- a/unit_test/rotate_test.cc
+++ b/unit_test/rotate_test.cc
@@ -83,56 +83,59 @@ static void I420TestRotate(int src_width, int src_height,
   free_aligned_buffer_64(src_i420);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate0) {
+TEST_F(LibYUVRotateTest, I420Rotate0_Opt) {
   I420TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate90) {
+TEST_F(LibYUVRotateTest, I420Rotate90_Opt) {
   I420TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate180) {
+TEST_F(LibYUVRotateTest, I420Rotate180_Opt) {
   I420TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate270) {
+TEST_F(LibYUVRotateTest, I420Rotate270_Opt) {
   I420TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate270, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate0_Odd) {
+// TODO(fbarchard): Remove odd width tests.
+// Odd width tests work but disabled because they use C code and can be
+// tested by passing an odd width command line or environment variable.
+TEST_F(LibYUVRotateTest, DISABLED_I420Rotate0_Odd) {
   I420TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_width_ - 3, benchmark_height_ - 1,
                  kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate90_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_I420Rotate90_Odd) {
   I420TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_height_ - 1, benchmark_width_ - 3,
                  kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate180_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_I420Rotate180_Odd) {
   I420TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_width_ - 3, benchmark_height_ - 1,
                  kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, I420Rotate270_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_I420Rotate270_Odd) {
   I420TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_height_ - 1, benchmark_width_ - 3,
                  kRotate270, benchmark_iterations_,
@@ -203,56 +206,56 @@ static void NV12TestRotate(int src_width, int src_height,
   free_aligned_buffer_64(src_nv12);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate0) {
+TEST_F(LibYUVRotateTest, NV12Rotate0_Opt) {
   NV12TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate90) {
+TEST_F(LibYUVRotateTest, NV12Rotate90_Opt) {
   NV12TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate180) {
+TEST_F(LibYUVRotateTest, NV12Rotate180_Opt) {
   NV12TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_width_, benchmark_height_,
                  kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate270) {
+TEST_F(LibYUVRotateTest, NV12Rotate270_Opt) {
   NV12TestRotate(benchmark_width_, benchmark_height_,
                  benchmark_height_, benchmark_width_,
                  kRotate270, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate0_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_NV12Rotate0_Odd) {
   NV12TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_width_ - 3, benchmark_height_ - 1,
                  kRotate0, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate90_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_NV12Rotate90_Odd) {
   NV12TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_height_ - 1, benchmark_width_ - 3,
                  kRotate90, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate180_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_NV12Rotate180_Odd) {
   NV12TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_width_ - 3, benchmark_height_ - 1,
                  kRotate180, benchmark_iterations_,
                  disable_cpu_flags_, benchmark_cpu_info_);
 }
 
-TEST_F(LibYUVRotateTest, NV12Rotate270_Odd) {
+TEST_F(LibYUVRotateTest, DISABLED_NV12Rotate270_Odd) {
   NV12TestRotate(benchmark_width_ - 3, benchmark_height_ - 1,
                  benchmark_height_ - 1, benchmark_width_ - 3,
                  kRotate270, benchmark_iterations_,