Merge pull request #248 from tamird/test-on-osx

CI: OS X + faster builds

.travis.yml

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

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=. "