Commit 853dc689 authored by fbarchard@google.com's avatar fbarchard@google.com

Allow TextVersion to be with 5 of actual version. This allows a few changes…

Allow TextVersion to be with 5 of actual version.  This allows a few changes without failing the unittest before version.h must be updated.  Note that changes of documentation count.
BUG=none
TEST=TestVersion passes, even though this CL purposely does not update the version.
Review URL: https://webrtc-codereview.appspot.com/781007

git-svn-id: http://libyuv.googlecode.com/svn/trunk@344 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 93fdfd19
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 342 Version: 344
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 342 #define LIBYUV_VERSION 344
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
namespace libyuv { 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(libyuvTest, TestVersion) { TEST_F(libyuvTest, TestVersion) {
EXPECT_GE(LIBYUV_VERSION, 169); // 169 is first version to support version. EXPECT_GE(LIBYUV_VERSION, 169); // 169 is first version to support version.
printf("LIBYUV_VERSION %d\n", LIBYUV_VERSION); printf("LIBYUV_VERSION %d\n", LIBYUV_VERSION);
...@@ -27,7 +30,7 @@ TEST_F(libyuvTest, TestVersion) { ...@@ -27,7 +30,7 @@ TEST_F(libyuvTest, TestVersion) {
} }
int svn_revision = atoi(ver); int svn_revision = atoi(ver);
printf("LIBYUV_SVNREVISION %d\n", svn_revision); printf("LIBYUV_SVNREVISION %d\n", svn_revision);
EXPECT_GE(LIBYUV_VERSION, svn_revision); EXPECT_NEAR(LIBYUV_VERSION, svn_revision, 3); // Allow version to be close.
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment