diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-03-18 09:50:34 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-03-18 09:50:34 -0700 |
| commit | d8866ed53594e34cab095ccae7c7b766026c6cf0 (patch) | |
| tree | a756ec9ffcfe4521789bfe612c17b1ad3086c153 | |
| parent | 813d6d652d8091e9365bfbd01efb5f2ee8bdfbce (diff) | |
| parent | a2655e7c4ee3c3db3eecaff41c4b83a63f846deb (diff) | |
| download | protobuf-d8866ed53594e34cab095ccae7c7b766026c6cf0.tar.gz protobuf-d8866ed53594e34cab095ccae7c7b766026c6cf0.tar.bz2 protobuf-d8866ed53594e34cab095ccae7c7b766026c6cf0.zip | |
Merge pull request #248 from tamird/test-on-osx
CI: OS X + faster builds
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/command_line_interface_unittest.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 93013b8b..18114878 100644 --- a/.travis.yml +++ b/.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 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=. " |