Merge 5582a9c into fa766af

GlPortal · Mar 7, 2017 · 848f16f · 848f16f
2 parents fa766af + 5582a9c
commit 848f16f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1 @@
+repo_token: XcgjR2KjUHOkdLygzBTf6fqDDy3neAMFA
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,16 @@ matrix:
   include:
     - os: linux
       services: docker
-      before_install: docker pull glportal/whale-gcc:bullet286
+      before_install: 
+        - docker pull glportal/whale-gcc:bullet285
+        - pip install --user cpp-coveralls
+        - pip install --user pyyaml
       script:
         - set -e
-        - docker run -it --rm -w /data -v $(pwd):/data glportal/whale-gcc:bullet286 bash -c "cmake ./; make; make tests; ctest;"
+        - docker run -it --rm -w /data -v $(pwd):/data glportal/whale-gcc:bullet285 bash -c "cmake ./; make; make tests; ctest;"
+      after_success:
+        - sudo ln -s $(pwd) /data
+        - coveralls --exclude lib --exclude external --exclude tests --gcov-options '\-lp'
   exclude:
     - os: osx
       osx_image: xcode7.3

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 set(RADIX_LIBRARY RadixEngine)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 
 if(NOT DEFINED CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type")

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/GlPortal/RadixEngine.svg?branch=master)](https://travis-ci.org/GlPortal/RadixEngine)
+[![Coverage Status](https://coveralls.io/repos/github/GlPortal/RadixEngine/badge.svg?branch=coveralls)](https://coveralls.io/github/GlPortal/RadixEngine?branch=coveralls)
 [![Join Chat](https://img.shields.io/badge/reddit-join_chat-brightgreen.svg)](https://www.reddit.com/r/RadixEngine/)
 #![RadixEngine](https://raw.githubusercontent.com/GlPortal/glportal_raw_data/master/graphics/logo/radix/RadixEngine.png "RadixEngine")
 

diff --git a/source/physics/Uncollider.cpp b/source/physics/Uncollider.cpp
@@ -81,8 +81,8 @@ void Uncollider::nearCallback(btBroadphasePair &collisionPair,
 
     btManifoldResult contactPointResult(&obj0Wrap, &obj1Wrap);
 
-    if (not collisionPair.m_algorithm) {
 #if (BT_BULLET_VERSION >=286)
+    if (not collisionPair.m_algorithm) {
       collisionPair.m_algorithm =
         dispatcher.findAlgorithm(&obj0Wrap, &obj1Wrap,
                                  contactPointResult.getPersistentManifold(),