diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-12-09 11:15:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 11:15:06 -0500 |
commit | e43f73e09906004a0ccd2644984dbbae07c595da (patch) | |
tree | 36cb4505f06d9cf05bfa9e254fc35a08a443fe6d /tests.sh | |
parent | 243ebec887a2095cdba6773cb9151b3509a3fc5e (diff) | |
parent | 70e21d7cf9bce62ccae8ab89088873598b14238e (diff) | |
download | protobuf-e43f73e09906004a0ccd2644984dbbae07c595da.tar.gz protobuf-e43f73e09906004a0ccd2644984dbbae07c595da.tar.bz2 protobuf-e43f73e09906004a0ccd2644984dbbae07c595da.zip |
Merge pull request #2473 from thomasvl/update_xcodes
Update xcode version support and travis usage
Diffstat (limited to 'tests.sh')
-rwxr-xr-x | tests.sh | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -38,11 +38,21 @@ build_cpp() { make check -j2 cd conformance && make test_cpp && cd .. - # Verify benchmarking code can build successfully. - git submodule init - git submodule update - cd third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make && cd ../.. - cd benchmarks && make && ./generate-datasets && cd .. + # The benchmark code depends on cmake, so test if it is installed before + # trying to do the build. + # NOTE: The travis macOS images say they have cmake, but the xcode8.1 image + # appears to be missing it: https://github.com/travis-ci/travis-ci/issues/6996 + if [[ $(type cmake 2>/dev/null) ]]; then + # Verify benchmarking code can build successfully. + git submodule init + git submodule update + cd third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make && cd ../.. + cd benchmarks && make && ./generate-datasets && cd .. + else + echo "" + echo "WARNING: Skipping validation of the bench marking code, cmake isn't installed." + echo "" + fi } build_cpp_distcheck() { |