Skip to content

Commit 30075ab

Browse files
committed
configure: disable netloc by default in 2.3
Still too experimental, might get removed if we don't find some manpower to revive it And also disable netloc in sonarscanner job Signed-off-by: Brice Goglin <[email protected]> (cherry picked from commit 2082c24 and 15a927b) (cherry picked from commit eddcbcf) Signed-off-by: Brice Goglin <[email protected]>
1 parent 0ed3a41 commit 30075ab

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ AC_SUBST([libnetloc_so_version])
143143

144144
AC_ARG_ENABLE([netloc],
145145
[AC_HELP_STRING([--enable-netloc],
146-
[The Netloc functionality is enabled by default, but will be silently skipped it if cannot be built (e.g., not supported on your platform). Using --enable-netloc will cause configure to abort if Netloc cannot be build. Using --disable-netloc will cause configure to skip attempting to build netloc at all.])
146+
[The Netloc functionality is disabled by default. Using --enable-netloc will cause configure to abort if Netloc cannot be build (e.g., not supported on your platform).])
147147
])
148148

149-
AS_IF([test "$enable_netloc" != "no" -a "$hwloc_mode" = "standalone"],
149+
AS_IF([test "$enable_netloc" = "yes" -a "$hwloc_mode" = "standalone"],
150150
[NETLOC_SETUP_CORE([], [],
151151
[AS_IF([test "$enable_netloc" = "yes"],
152152
[AC_MSG_ERROR([Cannot build netloc core])])

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make |
7777
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
80-
SOURCES_TO_ANALYZE="hwloc netloc tests utils"
80+
SOURCES_TO_ANALYZE="hwloc tests utils"
8181
SOURCES_TO_EXCLUDE="-itests/hwloc/ports -ihwloc/topology-aix.c -ihwloc/topology-bgq.c -ihwloc/topology-darwin.c -ihwloc/topology-freebsd.c -ihwloc/topology-hpux.c -ihwloc/topology-netbsd.c -ihwloc/topology-solaris.c -ihwloc/topology-solaris-chiptype.c -ihwloc/topology-windows.c -ihwloc/topology-cuda.c -ihwloc/topology-gl.c -ihwloc/topology-nvml.c -ihwloc/topology-rsmi.c -ihwloc/topology-opencl.c -iutils/lstopo/lstopo-windows.c"
8282
CPPCHECK_INCLUDES="-Iinclude -Ihwloc -Iutils/lstopo -Iutils/hwloc"
8383
CPPCHECK="cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=purgedConfiguration --suppress=missingIncludeSystem ${CPPCHECK_INCLUDES}"
@@ -152,7 +152,7 @@ sonar.scm.disabled=false
152152
# sonar.scm.provider=git requires sonar-scanner to run inside a git clone
153153
sonar.sourceEncoding=UTF-8
154154
sonar.language=c
155-
sonar.sources=hwloc, netloc, tests, utils
155+
sonar.sources=hwloc, tests, utils
156156
sonar.exclusions=tests/hwloc/ports
157157
sonar.c.clangsa.reportPath=analyzer_reports/*/*.plist
158158
sonar.c.errorRecoveryEnabled=true

0 commit comments

Comments
 (0)