Skip to content

Commit

Permalink
configure: disable netloc by default in 2.3
Browse files Browse the repository at this point in the history
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 <Brice.Goglin@inria.fr>
(cherry picked from commit 2082c24
                       and 15a927b)
(cherry picked from commit eddcbcf)
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Sep 21, 2020
1 parent 0ed3a41 commit 30075ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ AC_SUBST([libnetloc_so_version])

AC_ARG_ENABLE([netloc],
[AC_HELP_STRING([--enable-netloc],
[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.])
[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).])
])

AS_IF([test "$enable_netloc" != "no" -a "$hwloc_mode" = "standalone"],
AS_IF([test "$enable_netloc" = "yes" -a "$hwloc_mode" = "standalone"],
[NETLOC_SETUP_CORE([], [],
[AS_IF([test "$enable_netloc" = "yes"],
[AC_MSG_ERROR([Cannot build netloc core])])
Expand Down
4 changes: 2 additions & 2 deletions contrib/ci.inria.fr/job-3-sonarscanner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make |
test x$NO_CHECK = xtrue || scan-build -plist --intercept-first --analyze-headers -o analyzer_reports make check | tee -a scan-build.log

# Run cppcheck analysis
SOURCES_TO_ANALYZE="hwloc netloc tests utils"
SOURCES_TO_ANALYZE="hwloc tests utils"
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"
CPPCHECK_INCLUDES="-Iinclude -Ihwloc -Iutils/lstopo -Iutils/hwloc"
CPPCHECK="cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=purgedConfiguration --suppress=missingIncludeSystem ${CPPCHECK_INCLUDES}"
Expand Down Expand Up @@ -152,7 +152,7 @@ sonar.scm.disabled=false
# sonar.scm.provider=git requires sonar-scanner to run inside a git clone
sonar.sourceEncoding=UTF-8
sonar.language=c
sonar.sources=hwloc, netloc, tests, utils
sonar.sources=hwloc, tests, utils
sonar.exclusions=tests/hwloc/ports
sonar.c.clangsa.reportPath=analyzer_reports/*/*.plist
sonar.c.errorRecoveryEnabled=true
Expand Down

0 comments on commit 30075ab

Please sign in to comment.