Skip to content

Commit

Permalink
contrib/ci.inria.fr: never disable make check in coverity and sonar-s…
Browse files Browse the repository at this point in the history
…canner jobs

NO_CHECK would make some issues disappear just because we disabled make check
in a custom job config.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Jan 13, 2022
1 parent eb4f090 commit 7c594cc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
7 changes: 5 additions & 2 deletions contrib/ci.inria.fr/job-3-coverity.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright © 2012-2020 Inria. All rights reserved.
# Copyright © 2012-2022 Inria. All rights reserved.
# See COPYING in top-level directory.
#

Expand Down Expand Up @@ -55,7 +55,10 @@ COVBALL=myproject.tgz
# run
./configure --enable-plugins
cov-build --dir ${COVDIR} make all
test x$NO_CHECK = xtrue || cov-build --dir ${COVDIR} make check
# run 'make check' even if NO_CHECK is set
# (we don't want some issues to disappear from coverity depending on custom job config)
cov-build --dir ${COVDIR} make check

tar cfvz ${COVBALL} ${COVDIR}
curl --form file=@${COVBALL} \
--form "token=<${COVERITY_TOKEN_FILE}" \
Expand Down
7 changes: 4 additions & 3 deletions contrib/ci.inria.fr/job-3-sonarscanner.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright © 2012-2021 Inria. All rights reserved.
# Copyright © 2012-2022 Inria. All rights reserved.
# See COPYING in top-level directory.
#

Expand Down Expand Up @@ -59,8 +59,9 @@ export CFLAGS="-O0 -g -fPIC --coverage -Wall -Wunused-parameter -Wundef -Wno-lon
export LDFLAGS="--coverage"
./configure --enable-plugins
make V=1 | tee hwloc-build.log
# Execute unitary tests (autotest)
test x$NO_CHECK = xtrue || make check
# run 'make check' even if NO_CHECK is set
# (we don't want some issues to disappear from sonarqube depending on custom job config)
make check

# Collect coverage data
find . -path '*/.libs/*.gcno' -exec rename 's@/.libs/@/@' {} \;
Expand Down

0 comments on commit 7c594cc

Please sign in to comment.