merge(3p/abseil_cpp): Merge upstream at 'ccdbb5941'
Change-Id: I6e85fc7b5f76bba1f1eef15e600a8acb64e97ef5
This commit is contained in:
commit
543379ce45
97 changed files with 3546 additions and 2316 deletions
|
|
@ -21,15 +21,13 @@
|
|||
#include <string>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "absl/flags/declare.h"
|
||||
#include "absl/flags/flag.h"
|
||||
#include "absl/flags/internal/parse.h"
|
||||
#include "absl/flags/internal/path_util.h"
|
||||
#include "absl/flags/internal/program_name.h"
|
||||
#include "absl/flags/internal/registry.h"
|
||||
#include "absl/flags/reflection.h"
|
||||
#include "absl/flags/usage.h"
|
||||
#include "absl/flags/usage_config.h"
|
||||
#include "absl/memory/memory.h"
|
||||
#include "absl/strings/match.h"
|
||||
#include "absl/strings/string_view.h"
|
||||
|
||||
|
|
@ -91,7 +89,7 @@ class UsageReportingTest : public testing::Test {
|
|||
}
|
||||
|
||||
private:
|
||||
flags::FlagSaver flag_saver_;
|
||||
absl::FlagSaver flag_saver_;
|
||||
};
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
|
@ -112,7 +110,7 @@ TEST_F(UsageReportingDeathTest, TestSetProgramUsageMessage) {
|
|||
// --------------------------------------------------------------------
|
||||
|
||||
TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_01) {
|
||||
const auto* flag = flags::FindCommandLineFlag("usage_reporting_test_flag_01");
|
||||
const auto* flag = absl::FindCommandLineFlag("usage_reporting_test_flag_01");
|
||||
std::stringstream test_buf;
|
||||
|
||||
flags::FlagHelp(test_buf, *flag, flags::HelpFormat::kHumanReadable);
|
||||
|
|
@ -124,7 +122,7 @@ TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_01) {
|
|||
}
|
||||
|
||||
TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_02) {
|
||||
const auto* flag = flags::FindCommandLineFlag("usage_reporting_test_flag_02");
|
||||
const auto* flag = absl::FindCommandLineFlag("usage_reporting_test_flag_02");
|
||||
std::stringstream test_buf;
|
||||
|
||||
flags::FlagHelp(test_buf, *flag, flags::HelpFormat::kHumanReadable);
|
||||
|
|
@ -136,7 +134,7 @@ TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_02) {
|
|||
}
|
||||
|
||||
TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_03) {
|
||||
const auto* flag = flags::FindCommandLineFlag("usage_reporting_test_flag_03");
|
||||
const auto* flag = absl::FindCommandLineFlag("usage_reporting_test_flag_03");
|
||||
std::stringstream test_buf;
|
||||
|
||||
flags::FlagHelp(test_buf, *flag, flags::HelpFormat::kHumanReadable);
|
||||
|
|
@ -148,7 +146,7 @@ TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_03) {
|
|||
}
|
||||
|
||||
TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_04) {
|
||||
const auto* flag = flags::FindCommandLineFlag("usage_reporting_test_flag_04");
|
||||
const auto* flag = absl::FindCommandLineFlag("usage_reporting_test_flag_04");
|
||||
std::stringstream test_buf;
|
||||
|
||||
flags::FlagHelp(test_buf, *flag, flags::HelpFormat::kHumanReadable);
|
||||
|
|
@ -160,7 +158,7 @@ TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_04) {
|
|||
}
|
||||
|
||||
TEST_F(UsageReportingTest, TestFlagHelpHRF_on_flag_05) {
|
||||
const auto* flag = flags::FindCommandLineFlag("usage_reporting_test_flag_05");
|
||||
const auto* flag = absl::FindCommandLineFlag("usage_reporting_test_flag_05");
|
||||
std::stringstream test_buf;
|
||||
|
||||
flags::FlagHelp(test_buf, *flag, flags::HelpFormat::kHumanReadable);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue