From 581767b491fa9c8bfeefcc4457a8fb156b19cf6a Mon Sep 17 00:00:00 2001 From: Andi Date: Sat, 23 Mar 2024 15:45:12 +0100 Subject: [PATCH] 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 #include -#include - #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 + 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 ////////////////////////////////////////////////////// #include -#include #include #include 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 #include #include #include 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 #include -#include #include #include 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 -#include +#include #include #include "utils/settings.hpp"