debug sonar error on travis

djmott · Jul 2, 2016 · b6e7c83 · b6e7c83
1 parent 902c328
commit b6e7c83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,7 @@ script:
   - for item in $( find -name '*.gcda' ); do gcov -l $item; done
   - for item in $( find -name '*.gcda' ); do gcovr -x -r .  > $TRAVIS_BUILD_DIR/docs/reports/gcov/$(basename $item).xml; done
   - cd $TRAVIS_BUILD_DIR/
-  - sonar-scanner -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=$SONAR_TOKEN
+  - sonar-scanner -e -X -Dsonar.host.url=https://nemo.sonarqube.org -Dsonar.login=$SONAR_TOKEN
 success:
   - cd $TRAVIS_BUILD_DIR/docs/html
   - git init

diff --git a/src/event_trace/event_trace.cpp b/src/event_trace/event_trace.cpp
@@ -11,14 +11,18 @@ namespace{
 
 extern "C"{
   void __xtd_EventEnter(void *){
-    if (_InTrace) return;
+    if (_InTrace){
+      return;
+    }
     _InTrace = true;
     _ThreadStack.push("");
     _InTrace = false;
   }
 
   void __xtd_EventLeave(void *){
-    if (_InTrace) return;
+    if (_InTrace){
+      return;
+    }
     _InTrace = true;
     _ThreadStack.pop();
     _InTrace = false;