This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push: new 679274d GEODE-8949 rollback travis config since docker image updated to lates… (#749) 679274d is described below commit 679274d378976d200d7c5b02ac0b83188ebd1481 Author: Michael Martell <mmart...@pivotal.io> AuthorDate: Mon Feb 22 20:33:49 2021 -0800 GEODE-8949 rollback travis config since docker image updated to lates… (#749) * GEODE-8949 rollback travis config since docker image updated to latest cmake * Fix clang-format error --- .travis.yml | 7 ++----- tests/cpp/fwklib/FwkBB.hpp | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b2efed..60739c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,10 @@ env: - DOCKER_ARGS="--rm --volume=${TRAVIS_BUILD_DIR}:/geode-native" - DOCKER_IMAGE="apachegeode/geode-native-build:latest" - SOURCE_DIR="/geode-native" - - CMAKE_VERSION=3.18 - - PATH=/tmp/cmake-${CMAKE_VERSION}.0-Linux-x86_64/bin:$PATH - matrix: - - DOCKER_COMMAND="pushd /tmp && wget -O cmake.tgz https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.0-Linux-x86_64.tar.gz && tar xzf cmake.tgz && popd && echo rat && mkdir build && cd build && /tmp/cmake-3.18.0-Linux-x86_64/bin/cmake ${SOURCE_DIR} -DUSE_RAT=ON && /tmp/cmake-3.18.0-Linux-x86_64/bin/cmake --build . --target rat-check" - - DOCKER_COMMAND="pushd /tmp && wget -O cmake.tgz https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.0-Linux-x86_64.tar.gz && tar xzf cmake.tgz && popd && echo test && mkdir build && cd build && /tmp/cmake-3.18.0-Linux-x86_64/bin/cmake ${SOURCE_DIR} -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_CXX_CLANG_TIDY=clang-tidy && /tmp/cmake-3.18.0-Linux-x86_64/bin/cmake --build . -- -j2 && ./cppcache/test/apache-geode_unittests && git -C ${SOURCE_DIR} diff --exit-code" + - DOCKER_COMMAND="echo rat && mkdir build && cd build && cmake ${SOURCE_DIR} -DUSE_RAT=ON && cmake --build . --target rat-check" + - DOCKER_COMMAND="echo test && mkdir build && cd build && cmake ${SOURCE_DIR} -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_CXX_CLANG_TIDY=clang-tidy && cmake --build . -- -j2 && ./cppcache/test/apache-geode_unittests && git -C ${SOURCE_DIR} diff --exit-code" install: - docker pull "${DOCKER_IMAGE}" diff --git a/tests/cpp/fwklib/FwkBB.hpp b/tests/cpp/fwklib/FwkBB.hpp index 12c1ccf..b13eba3 100644 --- a/tests/cpp/fwklib/FwkBB.hpp +++ b/tests/cpp/fwklib/FwkBB.hpp @@ -50,18 +50,18 @@ namespace testframework { #define BB_RESULT_TAG "<r>" // #define BB_END_TAG "<e>" -#define BB_CLEAR_COMMAND "C" //"clear" -#define BB_DUMP_COMMAND "d" //"dump" -#define BB_GET_COMMAND "g" //"get" -#define BB_SET_COMMAND "s" //"set" -#define BB_ADD_COMMAND "A" //"add" -#define BB_SUBTRACT_COMMAND "S" //"subtract" -#define BB_INCREMENT_COMMAND "I" //"increment" -#define BB_DECREMENT_COMMAND "D" //"decrement" -#define BB_ZERO_COMMAND "z" //"zero" +#define BB_CLEAR_COMMAND "C" //"clear" +#define BB_DUMP_COMMAND "d" //"dump" +#define BB_GET_COMMAND "g" //"get" +#define BB_SET_COMMAND "s" //"set" +#define BB_ADD_COMMAND "A" //"add" +#define BB_SUBTRACT_COMMAND "S" //"subtract" +#define BB_INCREMENT_COMMAND "I" //"increment" +#define BB_DECREMENT_COMMAND "D" //"decrement" +#define BB_ZERO_COMMAND "z" //"zero" #define BB_SET_IF_GREATER_COMMAND "G" //"setIfGreater" -#define BB_SET_IF_LESS_COMMAND "L" //"setIfLess" -#define BB_SET_ACK_COMMAND "a" //"ack" +#define BB_SET_IF_LESS_COMMAND "L" //"setIfLess" +#define BB_SET_ACK_COMMAND "a" //"ack" // ----------------------------------------------------------------------------