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

diff --git a/sonar-project.properties b/sonar-project.properties
index 2151a65..bf87105 100644 (file)
--- 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 b9d6b77..9f742a7 100644 (file)
--- 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