From 633eb7bb8bbce2d31d682bf5255d9ef5a97a29c5 Mon Sep 17 00:00:00 2001 From: zxu Date: Fri, 9 Feb 2018 12:31:46 -0500 Subject: Let Travis run for `CMake` test and `lint.sh` (#769) * Fix nanopb (in cmake build) Look for binaries in the src dir (since that's where we build now.) This error would be masked if a previous build had completed prior to switching nanopb to build out of src. Also, don't patch the protoc path multiple times. This could be triggered by (eg) 'make && make clean && make'. * Add resource_path.{h,cc} to the cmake build * Fix signed/unsigned int comparison warnings * let Travis run for `CMake` test and `lint.sh` * Ensure FieldValue tag_ is initialized during cp/mv ctor. Otherwise, the assignment operator attempts to deallocate based on the (uninitialized) tag_ variable, posssibly leading to segfaults. * address change * fix trailing space * address change * moving Firestore checks closer together * Fix tests that throw exceptions. The (previous) tests checked to ensure that an abort() occurs, but if ABSL_HAVE_EXCEPTIONS is defined on non-macos (which is currently the default) then the assertions will throw a std::logic_error rather than abort()ing. On macos, an exception is thrown too, but the exception doesn't derrive from std::exception, so ASSERT_DEATH_* doesn't catch it (hence why ASSERT_DEATH_* actually works.) To resolve this, I've switched to ASSERT_ANY_THROW. * ./scripts/lint.sh * Move FieldValue::tag_ initializer to be in class. * check Travis ulimit * check travis limit * set make -j 200 instead of unlimited * use cpu core number instead of 200 --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 2f8f497..042fab1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ before_install: - bundle exec pod install --project-directory=Example --repo-update - bundle exec pod install --project-directory=Firestore/Example --no-repo-update - brew install clang-format + - brew install cmake + - brew install go # Somehow the build for Abseil requires this. - echo "$TRAVIS_COMMIT_RANGE" - echo "$TRAVIS_PULL_REQUEST" - | @@ -35,6 +37,10 @@ script: if [ $SKIP_FIREBASE != 1 ]; then ./test.sh fi + - | + if [ $SKIP_FIRESTORE != 1 ]; then + ./scripts/lint.sh # Google C++ style compliance + fi - | if [ $SKIP_FIRESTORE != 1 ]; then ./Firestore/test.sh -- cgit v1.2.3