Skip to content

P
protobuf
Commit ed715048 authored by Tamir Duberstein's avatar Tamir Duberstein
Browse files
Options

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

parent 813d6d65
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
.travis.yml
View file @ ed715048
language: cpp language: cpp
os:
- linux
- osx
script: ./autogen.sh && ./configure && make distcheck script: ./autogen.sh && ./configure && make distcheck
notifications: notifications:
email: false email: false
src/google/protobuf/compiler/command_line_interface_unittest.cc
View file @ ed715048
...@@ -991,7 +991,7 @@ TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFile) { ...@@ -991,7 +991,7 @@ TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFile) {
" optional Foo foo = 1;\n" " optional Foo foo = 1;\n"
"}\n"); "}\n");
string current_working_directory = get_current_dir_name(); string current_working_directory = getcwd(NULL, 0);
SwitchToTempDirectory(); SwitchToTempDirectory();
Run("protocol_compiler --dependency_out=manifest --test_out=. " Run("protocol_compiler --dependency_out=manifest --test_out=. "
......
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