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

lgon528 · Mar 18, 2015 · ed71504 · ed71504
1 parent 813d6d6
commit ed71504
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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=. "