Merge pull request #31815 from vespa-engine/balder/single-gtest-runne…

…r-for-vespalib-util

Gather all gtests in tests/util in single gtest runner binary.

vespalib/CMakeLists.txt

@@ -196,21 +196,10 @@ vespa_define_module(
     src/tests/tutorial/threads
     src/tests/typify
     src/tests/unwind_message
-    src/tests/util/bfloat16
-    src/tests/util/cgroup_resource_limits
-    src/tests/util/file_area_freelist
-    src/tests/util/generation_hold_list
-    src/tests/util/generationhandler
+    src/tests/util
     src/tests/util/generationhandler_stress
     src/tests/util/hamming
     src/tests/util/md5
-    src/tests/util/memory_trap
-    src/tests/util/mmap_file_allocator
-    src/tests/util/mmap_file_allocator_factory
-    src/tests/util/rcuvector
-    src/tests/util/size_literals
-    src/tests/util/static_string
-    src/tests/util/string_escape
     src/tests/valgrind
     src/tests/visit_ranges
     src/tests/wakeup

vespalib/src/tests/util/CMakeLists.txt

@@ -0,0 +1,26 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+# Runner for unit tests written in gtest.
+# NOTE: All new test classes should be added here.
+vespa_add_executable(vespalib_util_gtest_runner_test_app TEST
+    SOURCES
+    gtest_runner.cpp
+    bfloat16_test.cpp
+    cgroup_resource_limits_test.cpp
+    file_area_freelist_test.cpp
+    generation_hold_list_test.cpp
+    generationhandler_test.cpp
+    memory_trap_test.cpp
+    mmap_file_allocator_factory_test.cpp
+    mmap_file_allocator_test.cpp
+    rcuvector_test.cpp
+    size_literals_test.cpp
+    static_string_test.cpp
+    string_escape_test.cpp
+    DEPENDS
+    vespalib
+    onnxruntime
+    GTest::GTest
+)
+
+vespa_add_test( NAME vespalib_util_gtest_runner_test_app COMMAND vespalib_util_gtest_runner_test_app)

vespalib/src/tests/util/bfloat16/bfloat16_test.cpp → vespalib/src/tests/util/bfloat16_test.cpp

@@ -219,5 +219,3 @@ TEST(OnnxBFloat16Test, has_same_encoding) {
     printf("floats that are NaN in both vespalib and onnx: %d (0x%04x)\n", nan_count, nan_count);
     printf("total count (OK + NaN): %d (0x%04x)\n", ok_count + nan_count, ok_count + nan_count);
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/cgroup_resource_limits/cgroup_resource_limits_test.cpp → vespalib/src/tests/util/cgroup_resource_limits_test.cpp

@@ -12,15 +12,16 @@ class CGroupResourceLimitsTest : public ::testing::Test
 protected:
     CGroupResourceLimitsTest();
     ~CGroupResourceLimitsTest();
-    void check_limits(const std::string &name, const std::optional<uint64_t>& memory_limit, const std::optional<uint32_t>& cpu_limit);
+    void check_limits(std::string_view name, const std::optional<uint64_t>& memory_limit, const std::optional<uint32_t>& cpu_limit);
 };
 
 CGroupResourceLimitsTest::CGroupResourceLimitsTest() = default;
 CGroupResourceLimitsTest::~CGroupResourceLimitsTest() = default;
 
 void
-CGroupResourceLimitsTest::check_limits(const std::string &base, const std::optional<uint64_t>& memory_limit, const std::optional<uint32_t>& cpu_limit)
+CGroupResourceLimitsTest::check_limits(std::string_view subdir, const std::optional<uint64_t>& memory_limit, const std::optional<uint32_t>& cpu_limit)
 {
+    std::string base = "cgroup_resource_limits/" + subdir;
     auto src_base = TEST_PATH(base);
     CGroupResourceLimits cg_limits(src_base + "/cgroup", src_base + "/self");
     EXPECT_EQ(memory_limit, cg_limits.get_memory_limit());
@@ -73,5 +74,3 @@ TEST_F(CGroupResourceLimitsTest, cgroup_v2_container)
 }
 
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/file_area_freelist/file_area_freelist_test.cpp → vespalib/src/tests/util/file_area_freelist_test.cpp

@@ -97,6 +97,3 @@ TEST_F(FileAreaFreeListTest, can_use_part_of_free_area)
     EXPECT_EQ(5, _freelist.alloc(1));
     EXPECT_EQ(bad_offset, _freelist.alloc(1));
 }
-
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/generation_hold_list/generation_hold_list_test.cpp → vespalib/src/tests/util/generation_hold_list_test.cpp

@@ -91,5 +91,3 @@ TEST_F(IntHoldListTest, reclaim_all_calls_callback_for_all_elements)
     assert_reclaim_all({3, 5});
     assert_reclaim_all({});
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/generationhandler/generationhandler_test.cpp → vespalib/src/tests/util/generationhandler_test.cpp

@@ -133,5 +133,3 @@ TEST_F(GenerationHandlerTest, require_that_generation_can_grow_large)
 }
 
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/gtest_runner.cpp

@@ -0,0 +1,8 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/vespalib/gtest/gtest.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("vespalib_util_gtest_runner");
+
+GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/memory_trap/memory_trap_test.cpp → vespalib/src/tests/util/memory_trap_test.cpp

@@ -57,5 +57,3 @@ TEST_F(MemoryTrapTest, read_from_hw_backed_trap_crashes_process) {
         do_not_optimize_away(dummy); // never reached
     },"");
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/mmap_file_allocator_factory/mmap_file_allocator_factory_test.cpp → vespalib/src/tests/util/mmap_file_allocator_factory_test.cpp

@@ -46,5 +46,3 @@ TEST(MmapFileAllocatorFactoryTest, nonempty_dir_gives_allocator)
     MmapFileAllocatorFactory::instance().setup("");
     std::filesystem::remove_all(std::filesystem::path(basedir));
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/mmap_file_allocator/mmap_file_allocator_test.cpp → vespalib/src/tests/util/mmap_file_allocator_test.cpp

@@ -129,5 +129,3 @@ TEST_P(MmapFileAllocatorTest, reuse_file_offset_works)
         EXPECT_EQ(0, memcmp(buf.data, world.c_str(), world.size() + 1));
     }
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/rcuvector/rcuvector_test.cpp → vespalib/src/tests/util/rcuvector_test.cpp

@@ -516,5 +516,3 @@ TEST(RcuVectorTest, single_writer_four_readers)
     StressFixture f;
     f.run_test(20000, 4);
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/size_literals/size_literals_test.cpp → vespalib/src/tests/util/size_literals_test.cpp

@@ -37,5 +37,3 @@ TEST(SizeLiteralsTest, simple_usage)
     EXPECT_TRUE(is_size_t(v42g));
     EXPECT_TRUE(is_size_t(v42t));
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/static_string/static_string_test.cpp → vespalib/src/tests/util/static_string_test.cpp

@@ -30,5 +30,3 @@ TEST(StaticStringViewTest, with_null_byte) {
     std::string expect("foo\0bar", 7);
     EXPECT_EQ(value.view(), expect);
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()

vespalib/src/tests/util/string_escape/string_escape_test.cpp → vespalib/src/tests/util/string_escape_test.cpp

@@ -40,5 +40,3 @@ TEST(StringEscapeTest, control_characters_are_escaped_in_content) {
     EXPECT_EQ(xml_content_escaped(stringref("\x00", 1)), "�");
     EXPECT_EQ(xml_content_escaped("\x1f"), "");
 }
-
-GTEST_MAIN_RUN_ALL_TESTS()