Module: check_mk
Branch: master
Commit: 9a3d2a6d7e45f5397db730ee632e2a9a2754e00b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a3d2a6d7e45f5…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Apr 26 11:34:22 2019 +0200
Improved filename mangling.
Change-Id: I67a09128ad41a567a15990468dcd165f5661b34a
---
livestatus/src/Makefile.am | 2 +-
livestatus/src/test/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index 399857f..f011256 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -193,7 +193,7 @@ cppcheck: compile_commands.json
# We need to mangle the result a bit to make Jenkins' Cppcheck plugin happy
cppcheck-xml: compile_commands.json
$(CPPCHECK) -UCMC --enable=all --suppressions-list=cppcheck-suppressions.txt
--inline-suppr --project=compile_commands.json --quiet --template=gcc --xml
--xml-version=2 2> cppcheck-result.xml
- sed -i "s%\\(<location file=\"\\)%\\1$(subdir)/%" cppcheck-result.xml
+ sed -i "s%\\(<location.* file=\"\\)\\([^/]\\)%\\1$(subdir)/\\2%"
cppcheck-result.xml
documentation:
$(DOXYGEN) doc/Doxyfile
diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am
index 1a5df70..ced6ea9 100644
--- a/livestatus/src/test/Makefile.am
+++ b/livestatus/src/test/Makefile.am
@@ -94,4 +94,4 @@ cppcheck: compile_commands.json
# We need to mangle the result a bit to make Jenkins' Cppcheck plugin happy
cppcheck-xml: compile_commands.json
$(CPPCHECK) -UCMC --enable=all --suppressions-list=../cppcheck-suppressions.txt
--inline-suppr --project=compile_commands.json --quiet --template=gcc --xml
--xml-version=2 2> cppcheck-result.xml
- sed -i "s%\\(<location file=\"\\)%\\1$(subdir)/%" cppcheck-result.xml
+ sed -i "s%\\(<location.* file=\"\\)\\([^/]\\)%\\1$(subdir)/\\2%"
cppcheck-result.xml