organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

make changes to pass Cygwin

Browse source
This commit is contained in:
jieluo@google.com 2014-08-05 20:18:53 +00:00
parent 91e32ac64d
commit abe61de6e6
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -29,7 +29,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([subdir-objects])
AC_ARG_WITH([zlib],
[AS_HELP_STRING([--with-zlib],
@ -46,6 +46,7 @@ AC_PROG_CC
AC_PROG_CXX
AC_LANG([C++])
ACX_USE_SYSTEM_EXTENSIONS
AM_PROG_AR
AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc
# test_util.cc takes forever to compile with GCC and optimization turned on.

14
src/google/protobuf/compiler/command_line_interface_unittest.cc
View file

@ -85,7 +85,7 @@ class CommandLineInterfaceTest : public testing::Test {
// Runs the CommandLineInterface with the given command line. The
// command is automatically split on spaces, and the string "$tmpdir"
// is replaced with TestTempDir().
void Run(const string& command);
void Run(const string& command, bool capture_stdout = false);
// -----------------------------------------------------------------
// Methods to set up the test (called before Run()).
@ -261,7 +261,7 @@ void CommandLineInterfaceTest::TearDown() {
mock_generators_to_delete_.clear();
}
void CommandLineInterfaceTest::Run(const string& command) {
void CommandLineInterfaceTest::Run(const string& command, bool capture_stdout) {
vector<string> args = Split(command, " ", true);
if (!disallow_plugins_) {
@ -308,13 +308,17 @@ void CommandLineInterfaceTest::Run(const string& command) {
argv[i] = args[i].c_str();
}
CaptureTestStdout();
if (capture_stdout) {
CaptureTestStdout();
}
CaptureTestStderr();
return_code_ = cli_.Run(args.size(), argv.get());
error_text_ = GetCapturedTestStderr();
captured_stdout_ = GetCapturedTestStdout();
if (capture_stdout) {
captured_stdout_ = GetCapturedTestStdout();
}
}
// -------------------------------------------------------------------
@ -1461,7 +1465,7 @@ TEST_F(CommandLineInterfaceTest, PrintFreeFieldNumbers) {
"}\n");
Run("protocol_compiler --print_free_field_numbers --proto_path=$tmpdir "
"foo.proto bar.proto baz.proto quz.proto");
"foo.proto bar.proto baz.proto quz.proto", true);
ExpectNoErrors();
ExpectCapturedStdout(