From e6a54f223a01bca6489139c211b2905e1deaaacf Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 19 Oct 2015 16:30:41 -0700 Subject: [PATCH] Call AllowCommandLineReparsing in unit tests Allows us to ignore flags passed on to us by Chromium build bots without having to explicitly disable them. (Thanks pbos!) TESTED=webrtc ran modules_unittests with a bogus flag did not result in an error. R=kjellander@chromium.org BUG=libyuv:507 Review URL: https://codereview.chromium.org/1417573002 . --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/unit_test.cc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index 07fa47c84..b09f86aa5 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1514 +Version: 1515 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 2267ad594..0c06e356d 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 1514 +#define LIBYUV_VERSION 1515 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc index e053a413a..594dd334a 100644 --- a/unit_test/unit_test.cc +++ b/unit_test/unit_test.cc @@ -304,6 +304,9 @@ LibYUVBaseTest::LibYUVBaseTest() : int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); + // AllowCommandLineParsing allows us to ignore flags passed on to us by + // Chromium build bots without having to explicitly disable them. + google::AllowCommandLineReparsing(); google::ParseCommandLineFlags(&argc, &argv, true); return RUN_ALL_TESTS(); }