Skip to content

[upstream_utils] Add googletest#6820

Merged
PeterJohnson merged 10 commits intowpilibsuite:mainfrom
pjreiniger:upstream_gtest
Jul 19, 2024
Merged

[upstream_utils] Add googletest#6820
PeterJohnson merged 10 commits intowpilibsuite:mainfrom
pjreiniger:upstream_gtest

Conversation

@pjreiniger
Copy link
Contributor

@pjreiniger pjreiniger commented Jul 9, 2024

Fixes #6811

Adds gtest to the source tree.

  • Gradle Build
  • Cmake Build
  • Artifact Publishing

Copy link
Member

@calcmogul calcmogul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use thirdparty instead of third_party for all the other upstream_utils imports.

@pjreiniger
Copy link
Contributor Author

So in its current state this splits include / src as the rest of the projects do. However, that means that we can't pull in the CMakeList.txt from the repo and I had to make my own, which spider webbed out quite a bit.

Would it be OK to leave the file structure how it is natively? If so I can undo the split and remove a lot of the extra churn

@pjreiniger pjreiniger marked this pull request as ready for review July 11, 2024 06:02
@pjreiniger pjreiniger requested review from a team and PeterJohnson as code owners July 11, 2024 06:02
PeterJohnson
PeterJohnson previously approved these changes Jul 17, 2024
@PeterJohnson PeterJohnson changed the title [upstream utils] Add gtest [upstream_utils] Add googletest Jul 17, 2024

artifactId = baseArtifactId
groupId artifactGroupId
version wpilibVersioning.version.get()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ThadHouse this will change versioning from the current thirdparty-googletest, correct? Is that an issue at all, or does this actually make things easier?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes things slightly easier, although it will require a new version of native-utils to actually pick up. Otherwise the old one will be picked up, which will be fine for now because its a static only library, and not part of the ABI of anything shipped.

Copy link
Member

@calcmogul calcmogul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be rebased to use the new upstream_utils API.

@PeterJohnson PeterJohnson merged commit f561a77 into wpilibsuite:main Jul 19, 2024
@pjreiniger pjreiniger deleted the upstream_gtest branch July 19, 2024 04:46
spacey-sooty added a commit to PhotonVision/photonvision that referenced this pull request Jan 1, 2025
This was rendered useless when googletest was added to the allwpilib
monorepo wpilibsuite/allwpilib#6820

Signed-off-by: Jade Turner <spacey-sooty@proton.me>
mcm001 pushed a commit to mcm001/photonvision that referenced this pull request Feb 18, 2025
This was rendered useless when googletest was added to the allwpilib
monorepo wpilibsuite/allwpilib#6820

Signed-off-by: Jade Turner <spacey-sooty@proton.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Move GoogleTest into the monorepo via upstream_utils

5 participants