From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 17 Jun 2016 12:30:00 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_14~965
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e55e975804ae9c6ec82a5fbac2c7ea2497757a28?hp=b9a15f078a62e397f321dfb570254652785cc377

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index d85b1711d3..908ed6e05e 100755
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -4,12 +4,12 @@
 #
 # Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1
 
-# On Mac OSX, you don't want to run SonarQube but to exec the build command directly.
-if [ ${TRAVIS_OS_NAME} != 'linux' ] 
+# On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly.
+if [ ${TRAVIS_OS_NAME} != 'linux' ] || [ ${TRAVIS_PULL_REQUEST} != 'false' ] 
 then
   exec "$@"
 fi
-# Passed this point, we are on Linux (exec never returns)
+# Passed this point, we are on Linux and not in a PR (exec never returns)
 
 
 # Be verbose and fail fast