From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 19 Jul 2017 17:32:34 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_17~363
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/817094bccfaafe29059ed2ff71c573699d5909bd?hp=d10ddd9895c0a89d79d4f8c5cba40943629a7ec1

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

diff --git a/sonar-project.properties b/sonar-project.properties
index 2151a654d1..bf87105017 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -56,7 +56,7 @@ sonar.issue.ignore.multicriteria.c4b.ruleKey=cpp:GlobalNamespaceMembers
 sonar.issue.ignore.multicriteria.c4b.resourceKey=examples/**/*.hpp
 
 # Replace alternative operator "not" with "!"
-# I like it better so please leave me alone
+# I like it better, so please leave me alone
 sonar.issue.ignore.multicriteria.c5a.ruleKey=cpp:S3659
 sonar.issue.ignore.multicriteria.c5a.resourceKey=**/*.cpp
 sonar.issue.ignore.multicriteria.c5b.ruleKey=cpp:S3659
@@ -66,7 +66,7 @@ sonar.issue.ignore.multicriteria.c5b.resourceKey=**/*.hpp
 # "reinterpret_cast" should not be used
 # But we need this to interface C and Fortran
 sonar.issue.ignore.multicriteria.f1.ruleKey=cpp:S3630
-sonar.issue.ignore.multicriteria.f1.resourceKey=src/smpi/smpi_f77.cpp
+sonar.issue.ignore.multicriteria.f1.resourceKey=src/smpi/bindings/smpi_f77*.cpp
 
 
 # Exclude some files from the analysis:
diff --git a/tools/simgrid.supp b/tools/simgrid.supp
index b9d6b77be1..9f742a7e1c 100644
--- a/tools/simgrid.supp
+++ b/tools/simgrid.supp
@@ -72,7 +72,7 @@
    fun:smpi_simulated_main_
 }
 
-#SMPI leaks the dlopen handle used for loading the program
+#SMPI leaks the dlopen handle used to load the program
 {
    dlopen handle leaks (1/2)
    Memcheck:Leak