Module: check_mk
Branch: master
Commit: 301ba732e3ec77e9550c5b58f61776befdf07f65
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=301ba732e3ec77…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Jul 30 14:16:02 2018 +0200
Use a recent version of googletest.
There is no recent released version, only some vague commitment to make one
"soon", see https://github.com/google/googletest/issues/1079. We can't wait
for that, so we pick the current master at 0048647619.
Note that according to the issue tracker/source code, the previous MinGW
problems have been fixed, so we can nuke our own patch.
Change-Id: I381a2b29d76da5ecba230122026df7ddcc9602ac
---
agents/windows/chroot_version | 2 +-
agents/windows/test/build-googletest | 14 +++-----
omd/packages/googletest/README | 1 +
.../googletest/googletest-0048647619.tar.gz | Bin 0 -> 980888 bytes
.../googletest/googletest-release-1.8.0.tar.gz | Bin 1281617 -> 0 bytes
...-googletest-compilation-MinGW-gtest-port.h.diff | 38 ---------------------
6 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version
index b4de394..48082f7 100644
--- a/agents/windows/chroot_version
+++ b/agents/windows/chroot_version
@@ -1 +1 @@
-11
+12
diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest
index fba94c3..84eb4b9 100755
--- a/agents/windows/test/build-googletest
+++ b/agents/windows/test/build-googletest
@@ -2,21 +2,15 @@
# Build MinGW libraries for Google Test and Google Mock.
set -e
-version=1.8.0
+version=0048647619
[[ -z $CHROOT_BUILD_DIR ]] && exit 1
. $CHROOT_BUILD_DIR/agents/windows/build.sh
parse-args "$@"
cd $CHROOT_BUILD_DIR/agents/windows
-tar xzf /$CHROOT_BUILD_DIR/omd/packages/googletest/googletest-release-${version}.tar.gz
-cd googletest-release-${version}
-
-# Fix googletest compilation with MinGW, see
-# https://github.com/google/googletest/issues/606
-cd googletest/include/gtest/internal
-patch gtest-port.h < /$CHROOT_BUILD_DIR/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff
-cd -
+tar xzf /$CHROOT_BUILD_DIR/omd/packages/googletest/googletest-${version}.tar.gz
+cd googletest-${version}
for project in test mock ; do
cd google${project}
@@ -44,4 +38,4 @@ for project in test mock ; do
done
cd ..
-rm -rf googletest-release-${version}
+rm -rf googletest-${version}
diff --git a/omd/packages/googletest/README b/omd/packages/googletest/README
new file mode 100644
index 0000000..3277d0e
--- /dev/null
+++ b/omd/packages/googletest/README
@@ -0,0 +1 @@
+( VERSION=0048647619; git archive --prefix=googletest-$VERSION/ -o ~/git/check_mk/omd/packages/googletest/googletest-$VERSION.tar.gz $VERSION )
diff --git a/omd/packages/googletest/googletest-0048647619.tar.gz b/omd/packages/googletest/googletest-0048647619.tar.gz
new file mode 100644
index 0000000..890ef7b
Binary files /dev/null and b/omd/packages/googletest/googletest-0048647619.tar.gz differ
diff --git a/omd/packages/googletest/googletest-release-1.8.0.tar.gz b/omd/packages/googletest/googletest-release-1.8.0.tar.gz
deleted file mode 100644
index a40df33..0000000
Binary files a/omd/packages/googletest/googletest-release-1.8.0.tar.gz and /dev/null differ
diff --git a/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff b/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff
deleted file mode 100644
index 6859bc1..0000000
--- a/omd/packages/googletest/patches/0001-Fix-googletest-compilation-MinGW-gtest-port.h.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- googletest-release-1.8.0/googletest/include/gtest/internal/gtest-port.h 2016-07-14 19:15:38.000000000 +0200
-+++ googletest-release-1.8.0-MinGW-patched/googletest/include/gtest/internal/gtest-port.h 2017-09-13 11:23:52.543574218 +0200
-@@ -604,7 +604,7 @@
- || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL)
- #endif // GTEST_HAS_PTHREAD
-
--#if GTEST_HAS_PTHREAD
-+#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
- // gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
- // true.
- # include <pthread.h> // NOLINT
-@@ -1441,7 +1441,7 @@
-
- // Defines synchronization primitives.
- #if GTEST_IS_THREADSAFE
--# if GTEST_HAS_PTHREAD
-+# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
- // Sleeps for (roughly) n milliseconds. This function is only for testing
- // Google Test's own constructs. Don't use it in user tests, either
- // directly or indirectly.
-@@ -1458,7 +1458,7 @@
- // Notification has already been imported into the namespace.
- // Nothing to do here.
-
--# elif GTEST_HAS_PTHREAD
-+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
- // Allows a controller thread to pause execution of newly created
- // threads until notified. Instances of this class must be created
- // and destroyed in the controller thread.
-@@ -1918,7 +1918,7 @@
- GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal);
- };
-
--# elif GTEST_HAS_PTHREAD
-+# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW
-
- // MutexBase and Mutex implement mutex on pthreads-based platforms.
- class MutexBase {
Module: check_mk
Branch: master
Commit: f8f4ffb6678d03181ff547983fe9a4f74ef5d8b3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f4ffb6678d03…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jul 27 13:49:56 2018 +0200
6374 FIX Fixed wrong Check_MK service execution time calculation with special agents
When hosts are checked using multiple agents the times of special agents
was not accounted correctly. This resulted in wrong numbers being reported
in the "execution time" output and wrong values in the graphs.
Change-Id: Idaf4999447be05e7f196b249cceb22822c254b15
---
.werks/6374 | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/.werks/6374 b/.werks/6374
new file mode 100644
index 0000000..c3fa18d
--- /dev/null
+++ b/.werks/6374
@@ -0,0 +1,13 @@
+Title: Fixed wrong Check_MK service execution time calculation with special agents
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.6.0i1
+Date: 1532692099
+
+When hosts are checked using multiple agents the times of special agents
+was not accounted correctly. This resulted in wrong numbers being reported
+in the "execution time" output and wrong values in the graphs.