diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 93013b8b..b2e73943 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: cpp +os: + - linux + - osx script: ./autogen.sh && ./configure && make distcheck notifications: email: false 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=. " |