commit 77dcace654b2a2627de56fb7b98d29172a2b55fb
author Ed Tanous <etanous@nvidia.com> Sat Sep 07 16:38:05 2024 -0700
committer Ed Tanous <ed@tanous.net> Fri Sep 13 21:54:10 2024 +0000
tree d15367d4dcec2959dcf79ec9b743900dc3516ad2
parent 6d799e14ccc18da425f9c6413df132ea905907eb

Reorganize gtest

Currently, gtest is included as a source library.  This means that every
test application compiles its own version of gtest.  This is wasteful,
even though it's likely not that expensive compared to other compile
time things.

Move gtest into a library, upgrade our version of gtest at the same
time.

Tested: unit tests pass

Change-Id: I5064848bd42d6b119a8d4aa9bcac13ad8ec65955
Signed-off-by: Ed Tanous <etanous@nvidia.com>

meson.build

diff --git a/meson.build b/meson.build
index f50212c..70d2068 100644
--- a/meson.build
+++ b/meson.build
@@ -258,7 +258,10 @@
 
 systemd = dependency('systemd')
 libsystemd = dependency('libsystemd')
-add_project_arguments('-DLIBSYSTEMD_VERSION=' + libsystemd.version(), language: 'cpp')
+add_project_arguments(
+    '-DLIBSYSTEMD_VERSION=' + libsystemd.version(),
+    language: 'cpp',
+)
 
 zlib = dependency('zlib')
 bmcweb_dependencies += [libsystemd, zlib]
@@ -312,24 +315,6 @@
     endforeach
 endif
 
-if get_option('tests').allowed()
-    gtest = dependency(
-        'gtest',
-        main: true,
-        version: '>=1.14.0',
-        disabler: true,
-        required: false,
-    )
-    gmock = dependency('gmock', required: false)
-    if not gtest.found() and get_option('tests').allowed()
-        gtest_proj = subproject('gtest', required: true)
-        gtest = gtest_proj.get_variable('gtest_main_dep')
-        gmock = gtest_proj.get_variable('gmock_dep')
-    endif
-    gtest = gtest.as_system('system')
-    gmock = gmock.as_system('system')
-endif
-
 systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
 
 bindir = get_option('prefix') + '/' + get_option('bindir')
@@ -457,6 +442,21 @@
 )
 
 if (get_option('tests').allowed())
+    gtest = dependency(
+        'gtest_main',
+        main: true,
+        version: '>=1.15.0',
+        required: true,
+    )
+    gmock = dependency('gmock', required: true)
+    gtestlib = static_library('gtestlib', dependencies: [gtest, gmock])
+    gtestdep = declare_dependency(
+        link_with: gtestlib,
+        dependencies: [
+            gtest.partial_dependency(includes: true),
+            gmock.partial_dependency(includes: true),
+        ],
+    )
     # generate the test executable
     foreach test_src : srcfiles_unittest
         test_bin = executable(
@@ -465,8 +465,8 @@
             link_with: bmcweblib,
             include_directories: incdir,
             install_dir: bindir,
-            dependencies: bmcweb_dependencies + [gtest, gmock],
+            dependencies: bmcweb_dependencies + [gtestdep],
         )
-        test(fs.stem(test_src), test_bin)
+        test(fs.stem(test_src), test_bin, protocol: 'gtest')
     endforeach
 endif