[upstream_utils] Add googletest (#6820)

Author: pjreiniger

.github/workflows/upstream-utils.yml

@@ -45,6 +45,11 @@ jobs:
           cd upstream_utils
           ./gcem.py clone
           ./gcem.py copy-upstream-to-thirdparty
+      - name: Run googletest.py
+        run: |
+          cd upstream_utils
+          ./googletest.py clone
+          ./googletest.py copy-upstream-to-thirdparty
       - name: Run json.py
         run: |
           cd upstream_utils

.styleguide

@@ -11,6 +11,7 @@ cppSrcFileInclude {
 
 modifiableFileExclude {
   cmake/toolchains/
+  thirdparty/
   \.patch$
   gradlew
 }

CMakeLists.txt

@@ -245,7 +245,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_UBSAN
 
 if(WITH_TESTS)
     enable_testing()
-    add_subdirectory(googletest)
+    add_subdirectory(thirdparty/googletest)
     include(GoogleTest)
 endif()
 

apriltag/CMakeLists.txt

@@ -157,5 +157,5 @@ install(EXPORT apriltag DESTINATION share/apriltag)
 if(WITH_TESTS)
     wpilib_add_test(apriltag src/test/native/cpp)
     target_include_directories(apriltag_test PRIVATE src/test/native/include)
-    target_link_libraries(apriltag_test apriltag gmock_main)
+    target_link_libraries(apriltag_test apriltag googletest)
 endif()

cameraserver/CMakeLists.txt

@@ -85,5 +85,5 @@ set_property(TARGET multiCameraServer PROPERTY FOLDER "examples")
 
 if(WITH_TESTS)
     wpilib_add_test(cameraserver src/test/native/cpp)
-    target_link_libraries(cameraserver_test cameraserver gtest)
+    target_link_libraries(cameraserver_test cameraserver googletest)
 endif()

crossConnIntegrationTests/build.gradle

@@ -65,7 +65,6 @@ model {
     components {
         crossConnIntegrationTests(NativeExecutableSpec) {
             targetBuildTypes 'debug'
-            nativeUtils.useRequiredLibrary(it, 'googletest_static')
             binaries.all { binary ->
                 if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
                     if (binary.buildType.name == 'debug') {
@@ -88,6 +87,7 @@ model {
                     project(':hal').addHalJniDependency(binary)
                     lib project: ':wpinet', library: 'wpinet', linkage: 'shared'
                     lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
+                    lib project: ':thirdparty:googletest', library: 'googletest', linkage: 'static'
                     if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
                         nativeUtils.useRequiredLibrary(binary, 'ni_link_libraries', 'ni_runtime_libraries')
                     }

cscore/CMakeLists.txt

@@ -143,5 +143,5 @@ endif()
 
 if(WITH_TESTS)
     wpilib_add_test(cscore src/test/native/cpp)
-    target_link_libraries(cscore_test cscore gmock)
+    target_link_libraries(cscore_test cscore googletest)
 endif()

googletest/CMakeLists.txt

@@ -96,5 +96,5 @@ endif()
 
 if(WITH_TESTS)
     wpilib_add_test(hal src/test/native/cpp)
-    target_link_libraries(hal_test hal gtest)
+    target_link_libraries(hal_test hal googletest)
 endif()

hal/CMakeLists.txt

@@ -97,5 +97,5 @@ target_link_libraries(ntcoredev ntcore)
 if(WITH_TESTS)
     wpilib_add_test(ntcore src/test/native/cpp)
     target_include_directories(ntcore_test PRIVATE src/main/native/cpp)
-    target_link_libraries(ntcore_test ntcore gmock_main wpiutil_testlib)
+    target_link_libraries(ntcore_test ntcore googletest wpiutil_testlib)
 endif()