diff options
author | Tamir Duberstein <tamird@gmail.com> | 2015-03-18 00:43:34 -0700 |
---|---|---|
committer | Tamir Duberstein <tamird@gmail.com> | 2015-03-18 00:43:34 -0700 |
commit | ed715048c60177a669dfcb2851f67e4951d97a5b (patch) | |
tree | 7a7f8bccb7e1ceeafab2e1cea5f984ce2bb38374 /src | |
parent | 813d6d652d8091e9365bfbd01efb5f2ee8bdfbce (diff) | |
download | protobuf-ed715048c60177a669dfcb2851f67e4951d97a5b.tar.gz protobuf-ed715048c60177a669dfcb2851f67e4951d97a5b.tar.bz2 protobuf-ed715048c60177a669dfcb2851f67e4951d97a5b.zip |
Add OS X to travis; fix tests to pass on OS X
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 2b26f3be..a2cbbdc6 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -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=. " |