Add OS X to travis; fix tests to pass on OS X

pull/248/head
Tamir Duberstein 10 years ago
parent 813d6d652d
commit ed715048c6
  1. 3
      .travis.yml
  2. 2
      src/google/protobuf/compiler/command_line_interface_unittest.cc

@ -1,4 +1,7 @@
language: cpp
os:
- linux
- osx
script: ./autogen.sh && ./configure && make distcheck
notifications:
email: false

@ -991,7 +991,7 @@ TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFile) {
" optional Foo foo = 1;\n"
"}\n");
string current_working_directory = get_current_dir_name();
string current_working_directory = getcwd(NULL, 0);
SwitchToTempDirectory();
Run("protocol_compiler --dependency_out=manifest --test_out=. "

Loading…
Cancel
Save