Skip to content

Commit

Permalink
Merge pull request #162 from PJK/pk/fixcmocka
Browse files Browse the repository at this point in the history
Fix cmocka using c++11 types
  • Loading branch information
PJK committed Oct 19, 2020
2 parents e9c4582 + 40384f7 commit 06e6221
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ matrix:
before_install:
- pushd ${HOME}
- git clone https://gitlab.com/cmocka/cmocka.git
- cd cmocka && mkdir build && cd build
- cd cmocka
- git checkout tags/cmocka-1.1.5
- mkdir build && cd build
- cmake .. && make -j2 && sudo make install
- cd .. && popd
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y clang-format-8 cppcheck; fi
Expand All @@ -46,10 +48,10 @@ script:
fi;
- mkdir build && cd build
- cmake -DWITH_TESTS=ON
-DCBOR_CUSTOM_ALLOC=ON
-DCMAKE_BUILD_TYPE=Debug
-DSANITIZE=OFF
..
-DCBOR_CUSTOM_ALLOC=ON
-DCMAKE_BUILD_TYPE=Debug
-DSANITIZE=OFF
..
- make VERBOSE=1
- ctest -VV
- ctest -T memcheck | tee memcheck.out
Expand Down

0 comments on commit 06e6221

Please sign in to comment.