From 5d0a871d37d39f6cd4dea6742d573de2665985a1 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 15 Oct 2015 19:13:07 -0700 Subject: [PATCH] remove have jpeg test This test is just a printf, not a real test, but somehow fails on arm. TBR=harryjin@google.com BUG=libyuv:506 Review URL: https://codereview.chromium.org/1409913002 . --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/color_test.cc | 2 +- unit_test/convert_test.cc | 8 -------- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/README.chromium b/README.chromium index 4f60df30f..1573fb635 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1511 +Version: 1512 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 8f3c58195..2c6d450e7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1511 +#define LIBYUV_VERSION 1512 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc index 705920883..45fef219a 100644 --- a/unit_test/color_test.cc +++ b/unit_test/color_test.cc @@ -37,7 +37,7 @@ namespace libyuv { #endif #define TESTCS(TESTNAME, YUVTOARGB, ARGBTOYUV, HS1, HS, HN, DIFF) \ - TEST_F(LibYUVColorTest, DISABLED_ ## TESTNAME) { \ + TEST_F(LibYUVColorTest, TESTNAME) { \ const int kPixels = benchmark_width_ * benchmark_height_; \ const int kHalfPixels = ((benchmark_width_ + 1) / 2) * \ ((benchmark_height_ + HS1) / HS); \ diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc index 330571c0d..0f8065539 100644 --- a/unit_test/convert_test.cc +++ b/unit_test/convert_test.cc @@ -1448,14 +1448,6 @@ TEST_F(LibYUVConvertTest, CropNV12) { free_aligned_buffer_64(src_y); } -TEST_F(LibYUVConvertTest, HaveJPEG) { -#ifdef HAVE_JPEG - printf("JPEG enabled\n."); -#else - printf("JPEG disabled\n."); -#endif -} - TEST_F(LibYUVConvertTest, TestYToARGB) { uint8 y[32]; uint8 expectedg[32];