Skip to content

Conversation

mcbarton
Copy link
Collaborator

@mcbarton mcbarton commented Oct 28, 2024

This PR will attempt to update the version of gtest we are using to version 1.15.2 .
Fixes #295

Copy link

codecov bot commented Oct 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.57%. Comparing base (9b5f4c5) to head (b631767).
Report is 10 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #344      +/-   ##
==========================================
+ Coverage   74.43%   74.57%   +0.14%     
==========================================
  Files           8        8              
  Lines        3204     3214      +10     
==========================================
+ Hits         2385     2397      +12     
+ Misses        819      817       -2     

see 3 files with indirect coverage changes

see 3 files with indirect coverage changes

@mcbarton mcbarton force-pushed the update-gtest-to-version-v1.15.2 branch 2 times, most recently from 8de0922 to 7c1b615 Compare October 29, 2024 13:21
@mcbarton mcbarton requested a review from vgvassilev October 29, 2024 13:57
Copy link
Contributor

@vgvassilev vgvassilev left a comment

Choose a reason for hiding this comment

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

LGTM!

@vgvassilev
Copy link
Contributor

Please squash on merge.

@mcbarton mcbarton force-pushed the update-gtest-to-version-v1.15.2 branch 2 times, most recently from 6ae2342 to c60d845 Compare October 31, 2024 09:51
@mcbarton mcbarton force-pushed the update-gtest-to-version-v1.15.2 branch from 823c24c to 54113ef Compare October 31, 2024 09:53
@mcbarton mcbarton requested a review from vgvassilev October 31, 2024 10:31
@mcbarton
Copy link
Collaborator Author

@vgvassilev This PR needs another review, as I had to take a different approach after your last review revealed an error in my previous approach.

# issues due to [[maybe_unused]] in gtest)
set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
set(CMAKE_CXX_FLAGS_TEMP_COPY ${CMAKE_CXX_FLAGS})
string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
Copy link
Contributor

Choose a reason for hiding this comment

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

I am wondering if we need to propagate CMAKE_CXX_COMPILER to the CMAKE_ARGS. Alternatively in CMAKE_ARGS we can append -no-pedantic to disable the default mode.

Copy link
Contributor

Choose a reason for hiding this comment

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

ping.

@mcbarton mcbarton requested a review from vgvassilev November 27, 2024 18:53
@mcbarton
Copy link
Collaborator Author

@vgvassilev Rather than add -no-pedantic in the osx build I just found where pedantic was being applied in the osx builds and removed. Is the PR good now?

Copy link
Contributor

@vgvassilev vgvassilev left a comment

Choose a reason for hiding this comment

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

LGTM!

@mcbarton mcbarton merged commit 2ee6d95 into compiler-research:main Nov 27, 2024
53 checks passed
@mcbarton mcbarton mentioned this pull request Feb 19, 2025
3 tasks
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.

Update Google Test used

2 participants