From 8413a52c04652aef948cce105071e12169fab87f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sat, 14 Jan 2023 11:22:41 +0100 Subject: [PATCH] Polish jenkins scripts without MSG. --- sonar-project.properties | 2 +- tools/jenkins/Flags.sh | 2 +- tools/jenkins/build.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 29e01eea69..4e39656c1e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -17,7 +17,7 @@ sonar.sources=src,examples,include,teshsuite sonar.issue.ignore.multicriteria=c1,c2a,c2b,c3,c5a,c5b,c6a,c6b,c7,c8,c9,c10a,c10b,c10c,cex1a,cex1b,cex2a,cex2b,cex3,cex4,cxx17a,cxx17b,cxx17c,cxx17d,cxx17e,cxx17f,f1,p1,s1,s2,s3,s4,s5 # Pointers should not be cast to integral types -# But we need that for jMSG, smpi and other places +# But we need that for smpi and other places sonar.issue.ignore.multicriteria.c1.ruleKey=cpp:S1767 sonar.issue.ignore.multicriteria.c1.resourceKey=**/*.cpp diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index 157800a331..cfebd3aa81 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -18,7 +18,7 @@ onoff() { fi } -[ $# -eq 4 ] || die "Needs 4 arguments : MC SMPI DEBUG" +[ $# -eq 3 ] || die "Needs 4 arguments : MC SMPI DEBUG" ### Cleanup previous runs diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 2d02d04fb8..904e14dcf4 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -210,7 +210,6 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \ -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \ -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \ -DCMAKE_DISABLE_SOURCE_CHANGES=ON ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \ - -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \ -DLTO_EXTRA_FLAG="auto" \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ "$SRCFOLDER" -- 2.20.1