Skip to content

Commit 777e694

Browse files
committed
ci.inria.fr: allow to disable checks when launching jobs manually
When NO_CHECK is set in the jenkins UI for launching the job: * make distcheck is replaced by make dist * make check is disabled * renaming check is also disabled since renaming is often done once new APIs are stabilized This is useful during development, when testing portability, adding printf for debugging backends, etc... anything that could break tests (because of spurious lines in the output) but should not prevent other pipeline steps from running. Also it makes the CI several minutes faster, especially the extended job on Windows. Signed-off-by: Brice Goglin <[email protected]>
1 parent c047008 commit 777e694

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

contrib/ci.inria.fr/job-0-tarball.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright © 2012-2019 Inria. All rights reserved.
3+
# Copyright © 2012-2020 Inria. All rights reserved.
44
# See COPYING in top-level directory.
55
#
66

@@ -53,7 +53,12 @@ sed -e 's/^snapshot_version=.*/snapshot_version='$snapshot/ \
5353
./configure
5454
make
5555

56-
if ! make distcheck; then
56+
if test x$NO_CHECK = xtrue; then
57+
distcheck=dist
58+
else
59+
distcheck=distcheck
60+
fi
61+
if ! make $distcheck; then
5762
# make distcheck temporarily sets the source directory as R/O.
5863
# a failure during that R/O step may cause git clean -fdx to fail during the next build
5964
chmod u+w -R .

contrib/ci.inria.fr/job-1-check.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mkdir build
3232
cd build
3333
../configure $HWLOC_CI_JOB1CHECK_CONFOPTS
3434
make
35-
make check
35+
test x$NO_CHECK = xtrue || make check
3636
utils/lstopo/lstopo-no-graphics -v
3737
cd ..
3838

@@ -41,12 +41,12 @@ mkdir build-plugins
4141
cd build-plugins
4242
$PWD/../configure --enable-plugins $HWLOC_CI_JOB1CHECK_CONFOPTS
4343
make
44-
make check
44+
test x$NO_CHECK = xtrue || make check
4545
tests/hwloc/wrapper.sh utils/lstopo/lstopo-no-graphics -v
4646
tests/hwloc/wrapper.sh utils/hwloc/hwloc-info --support
4747
cd ..
4848

4949
# check renaming
50-
(cd build/tests/hwloc/rename && make check)
50+
test x$NO_CHECK = xtrue || (cd build/tests/hwloc/rename && make check)
5151

5252
exit 0

contrib/ci.inria.fr/job-3-coverity.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ COVBALL=myproject.tgz
5555
# run
5656
./configure --enable-plugins
5757
cov-build --dir ${COVDIR} make all
58-
cov-build --dir ${COVDIR} make check
58+
test x$NO_CHECK = xtrue || cov-build --dir ${COVDIR} make check
5959
tar cfvz ${COVBALL} ${COVDIR}
6060
curl --form file=@${COVBALL} \
6161
--form "token=<${COVERITY_TOKEN_FILE}" \

contrib/ci.inria.fr/job-3-cygwin.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright © 2012-2018 Inria. All rights reserved.
3+
# Copyright © 2012-2020 Inria. All rights reserved.
44
# See COPYING in top-level directory.
55
#
66

@@ -29,7 +29,7 @@ mkdir build
2929
cd build
3030
../configure
3131
make
32-
make check
32+
test x$NO_CHECK = xtrue || make check
3333
utils/lstopo/lstopo-no-graphics -v
3434
cd ..
3535

contrib/ci.inria.fr/job-3-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mkdir build-plugins-debug
3232
cd build-plugins-debug
3333
../configure --enable-plugins --enable-debug $HWLOC_CI_JOB3DEBUG_CONFOPTS
3434
make
35-
make check
35+
test x$NO_CHECK = xtrue || make check
3636
tests/hwloc/wrapper.sh utils/lstopo/lstopo-no-graphics
3737
cd ..
3838

contrib/ci.inria.fr/job-3-mingw.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright © 2012-2018 Inria. All rights reserved.
3+
# Copyright © 2012-2020 Inria. All rights reserved.
44
# See COPYING in top-level directory.
55
#
66

@@ -22,6 +22,8 @@ docheck=1
2222
doinstall=1
2323
confopts=
2424

25+
test x$NO_CHECK = xtrue && docheck=0
26+
2527
while test $# -gt 0; do
2628
if test "$1" = "--no-tar"; then
2729
dotar=0

contrib/ci.inria.fr/job-3-sonarscanner.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export LDFLAGS="--coverage"
6060
./configure --enable-plugins
6161
make V=1 | tee hwloc-build.log
6262
# Execute unitary tests (autotest)
63-
make check
63+
test x$NO_CHECK = xtrue || make check
6464

6565
# Collect coverage data
6666
find . -path '*/.libs/*.gcno' -exec rename 's@/.libs/@/@' {} \;
@@ -74,7 +74,7 @@ export CFLAGS="-Wall -std=gnu99"
7474
unset LDFLAGS
7575
scan-build -plist --intercept-first --analyze-headers -o analyzer_reports ./configure --enable-plugins | tee scan-build.log
7676
scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make | tee -a scan-build.log
77-
scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make check | tee -a scan-build.log
77+
test x$NO_CHECK = xtrue || scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make check | tee -a scan-build.log
7878

7979
# Run cppcheck analysis
8080
SOURCES_TO_ANALYZE="hwloc netloc tests utils"

0 commit comments

Comments
 (0)