From 581767b491fa9c8bfeefcc4457a8fb156b19cf6a Mon Sep 17 00:00:00 2001
From: Andi <andi8647@gmail.com>
Date: Sat, 23 Mar 2024 15:45:12 +0100
Subject: [PATCH 1/2] Bump googletest to 1.14 (#1845)

---
 libs/setup.sh                                 | 2 +-
 tests/unit/bfs_fine_grained.cpp               | 4 ++--
 tests/unit/cypher_main_visitor.cpp            | 1 -
 tests/unit/storage_v2_durability_inmemory.cpp | 1 -
 tests/unit/storage_v2_replication.cpp         | 1 -
 tests/unit/utils_settings.cpp                 | 4 ++--
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libs/setup.sh b/libs/setup.sh
index e23c5efef..f5f3c6249 100755
--- a/libs/setup.sh
+++ b/libs/setup.sh
@@ -182,7 +182,7 @@ benchmark_tag="v1.6.0"
 repo_clone_try_double "${primary_urls[gbenchmark]}" "${secondary_urls[gbenchmark]}" "benchmark" "$benchmark_tag" true
 
 # google test
-googletest_tag="release-1.8.0"
+googletest_tag="v1.14.0"
 repo_clone_try_double "${primary_urls[gtest]}" "${secondary_urls[gtest]}" "googletest" "$googletest_tag" true
 
 # libbcrypt
diff --git a/tests/unit/bfs_fine_grained.cpp b/tests/unit/bfs_fine_grained.cpp
index 568206dfd..756090986 100644
--- a/tests/unit/bfs_fine_grained.cpp
+++ b/tests/unit/bfs_fine_grained.cpp
@@ -15,14 +15,14 @@
 #include <string>
 #include <unordered_map>
 
-#include <gtest/internal/gtest-param-util-generated.h>
-
 #include "auth/models.hpp"
 #include "disk_test_utils.hpp"
 #include "license/license.hpp"
 #include "storage/v2/disk/storage.hpp"
 #include "storage/v2/inmemory/storage.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace memgraph::query;
 using namespace memgraph::query::plan;
 
diff --git a/tests/unit/cypher_main_visitor.cpp b/tests/unit/cypher_main_visitor.cpp
index 33e3af2e3..26afd14f5 100644
--- a/tests/unit/cypher_main_visitor.cpp
+++ b/tests/unit/cypher_main_visitor.cpp
@@ -28,7 +28,6 @@
 #include <json/json.hpp>
 //////////////////////////////////////////////////////
 #include <antlr4-runtime.h>
-#include <gmock/gmock-matchers.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/storage_v2_durability_inmemory.cpp b/tests/unit/storage_v2_durability_inmemory.cpp
index 7794f2ab9..aa395e63a 100644
--- a/tests/unit/storage_v2_durability_inmemory.cpp
+++ b/tests/unit/storage_v2_durability_inmemory.cpp
@@ -9,7 +9,6 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include <gmock/gmock-generated-matchers.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest-death-test.h>
 #include <gtest/gtest.h>
diff --git a/tests/unit/storage_v2_replication.cpp b/tests/unit/storage_v2_replication.cpp
index 4ae2101cb..1135f63b9 100644
--- a/tests/unit/storage_v2_replication.cpp
+++ b/tests/unit/storage_v2_replication.cpp
@@ -15,7 +15,6 @@
 #include <thread>
 
 #include <fmt/format.h>
-#include <gmock/gmock-generated-matchers.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/unit/utils_settings.cpp b/tests/unit/utils_settings.cpp
index 388e467ed..b43ab132c 100644
--- a/tests/unit/utils_settings.cpp
+++ b/tests/unit/utils_settings.cpp
@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2024 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -11,7 +11,7 @@
 
 #include <filesystem>
 
-#include <gmock/gmock-generated-matchers.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "utils/settings.hpp"

From 3faa64a53c1872847422a3c2ab218c734ac0779a Mon Sep 17 00:00:00 2001
From: Andi <andi8647@gmail.com>
Date: Mon, 25 Mar 2024 08:20:55 +0100
Subject: [PATCH 2/2] Forbid TSAN with Jemalloc (#1842)

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c02039497..2f89cb3cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,6 +337,8 @@ if (ASAN)
 endif()
 
 if (TSAN)
+  message(WARNING "Disabling jemalloc as it doesn't work well with ASAN")
+  set(ENABLE_JEMALLOC OFF)
   # ThreadSanitizer generally requires all code to be compiled with -fsanitize=thread.
   # If some code (e.g. dynamic libraries) is not compiled with the flag, it can
   # lead to false positive race reports, false negative race reports and/or
@@ -352,7 +354,7 @@ if (TSAN)
   # By default ThreadSanitizer uses addr2line utility to symbolize reports.
   # llvm-symbolizer is faster, consumes less memory and produces much better
   # reports. To use it set runtime flag:
-  #   TSAN_OPTIONS="extern-symbolizer-path=~/llvm-symbolizer"
+  # TSAN_OPTIONS="extern-symbolizer-path=~/llvm-symbolizer"
   # For more runtime flags see: https://github.com/google/sanitizers/wiki/ThreadSanitizerFlags
 endif()