summaryrefslogtreecommitdiff
path: root/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch')
-rw-r--r--dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch b/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch
new file mode 100644
index 000000000000..b3bec4801f28
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch
@@ -0,0 +1,36 @@
+From 45d7978dafceca8200fa4434d762f62642dc7cb4 Mon Sep 17 00:00:00 2001
+From: Sergiu Deitsch <sergiud@users.noreply.github.com>
+Date: Tue, 2 Jan 2024 13:01:42 +0100
+Subject: [PATCH] fix(tests): prevent clang from optimizing new away (#1017)
+
+---
+ src/logging_unittest.cc | 13 +++++++++++--
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc
+index cb1c657e7..40da9a44d 100644
+--- a/src/logging_unittest.cc
++++ b/src/logging_unittest.cc
+@@ -355,12 +355,19 @@ struct NewHook {
+ }
+ };
+
++namespace {
++int* allocInt() { return new int; }
++} // namespace
++
+ TEST(DeathNoAllocNewHook, logging) {
+ // tests that NewHook used below works
+ NewHook new_hook;
+- ASSERT_DEATH({
+- new int;
+- }, "unexpected new");
++ // Avoid unused warnings under MinGW
++ //
++ // NOTE MSVC produces warning C4551 here if we do not take the address of the
++ // function explicitly.
++ (void)&allocInt;
++ ASSERT_DEATH({ allocInt(); }, "unexpected new");
+ }
+
+ void TestRawLogging() {