Skip to content

Fix overriding gtest with gmock#13304

Merged
edolstra merged 1 commit intoNixOS:masterfrom
fzakaria:small-fix
Jun 2, 2025
Merged

Fix overriding gtest with gmock#13304
edolstra merged 1 commit intoNixOS:masterfrom
fzakaria:small-fix

Conversation

@fzakaria
Copy link
Contributor

@fzakaria fzakaria commented May 31, 2025

Just a naming typo but at least this is more clear.

  • Added .direnv/ to gitignore

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

How did this work before...

* Added .direnv/ to gitignore
@fzakaria fzakaria requested a review from edolstra as a code owner May 31, 2025 14:43
@fzakaria fzakaria changed the title Overriding gtest with gmock Fix overriding gtest with gmock May 31, 2025
@edolstra edolstra merged commit 8676734 into NixOS:master Jun 2, 2025
14 checks passed
@roberth roberth added backports created Does not require attention and can be filtered away backport 2.28-maintenance Automatically creates a PR against the branch backport 2.29-maintenance Automatically creates a PR against the branch labels Jul 30, 2025
mergify bot added a commit that referenced this pull request Jul 31, 2025
…3304

Fix overriding gtest with gmock (backport #13304)
mergify bot added a commit that referenced this pull request Jul 31, 2025
…3304

Fix overriding gtest with gmock (backport #13304)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.28-maintenance Automatically creates a PR against the branch backport 2.29-maintenance Automatically creates a PR against the branch backports created Does not require attention and can be filtered away

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants