From ad71738f6abff75827941bf08a7de00ce4a0d354 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Thu, 21 Jan 2016 11:22:11 -0800 Subject: [PATCH] Remove svn version build and unittest. R=harryjin@google.com TBR=harryjin@google.com, kjellander@google.com BUG=libyuv:551 Review URL: https://codereview.chromium.org/1612123002 . --- CMakeLists.txt | 1 - README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv_test.gyp | 7 ------- unit_test/version_test.cc | 44 --------------------------------------- 5 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 unit_test/version_test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index fb4747527..bada89c7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,6 @@ set(ly_unittest_sources ${ly_base_dir}/unit_test/scale_test.cc ${ly_base_dir}/unit_test/unit_test.cc ${ly_base_dir}/unit_test/video_common_test.cc - ${ly_base_dir}/unit_test/version_test.cc ) set(ly_header_files diff --git a/README.chromium b/README.chromium index ef7e16311..6c9d79763 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1568 +Version: 1569 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 45950d447..75b01e14f 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 1568 +#define LIBYUV_VERSION 1569 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv_test.gyp b/libyuv_test.gyp index 201c96bee..003710667 100644 --- a/libyuv_test.gyp +++ b/libyuv_test.gyp @@ -9,7 +9,6 @@ { 'variables': { 'libyuv_disable_jpeg%': 0, - 'libyuv_enable_svn%': 0, }, 'targets': [ { @@ -54,14 +53,8 @@ 'unit_test/scale_test.cc', 'unit_test/unit_test.cc', 'unit_test/video_common_test.cc', - 'unit_test/version_test.cc', ], 'conditions': [ - [ 'libyuv_enable_svn == 1', { - 'defines': [ - 'LIBYUV_SVNREVISION=" -#include - -#include "libyuv/basic_types.h" -#include "libyuv/version.h" -#include "../unit_test/unit_test.h" - -namespace libyuv { - -// Tests SVN version against include/libyuv/version.h -// SVN version is bumped by documentation changes as well as code. -// Although the versions should match, once checked in, a tolerance is allowed. -TEST_F(LibYUVBaseTest, DISABLED_TestVersion) { - EXPECT_GE(LIBYUV_VERSION, 169); // 169 is first version to support version. - printf("LIBYUV_VERSION %d\n", LIBYUV_VERSION); -#ifdef LIBYUV_SVNREVISION - const char *ver = strchr(LIBYUV_SVNREVISION, ':'); - if (ver) { - ++ver; - } else { - ver = LIBYUV_SVNREVISION; - } - int svn_revision = atoi(ver); // NOLINT - printf("LIBYUV_SVNREVISION %d\n", svn_revision); - EXPECT_NEAR(LIBYUV_VERSION, svn_revision, 20); // Allow version to be close. - if (LIBYUV_VERSION != svn_revision) { - printf("WARNING - Versions do not match.\n"); - } -#else - printf("WARNING - SVN Version unavailable. Test not run.\n"); -#endif -} - -} // namespace libyuv