Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20652] Fix test filtering in CMake files #4650

Merged
merged 8 commits into from
Apr 7, 2024
Merged

[20652] Fix test filtering in CMake files #4650

merged 8 commits into from
Apr 7, 2024

Conversation

MiguelCompany
Copy link
Member

Description

This is a rework of #4603 for old branches where we are not using gtest_discover_tests().
Some commits have been directly cherry-picked, while others have been reworked.
The main difference is that here we are ignoring tests and thus the logic is positive (i.e. we IGNORE foo bar) while in master we are filtering them and thus the logic is negative (i.e. we TEST_FILTER -foo:bar)

@Mergifyio backport 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@MiguelCompany MiguelCompany added this to the v2.10.4 milestone Apr 4, 2024
@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Apr 4, 2024
@MiguelCompany
Copy link
Member Author

@richiprosima Please test this

@MiguelCompany
Copy link
Member Author

@Mergifyio rebase

@MiguelCompany
Refs #20652. Fix windows command to check local DNS name.
edb74aa 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Correctly combine blackbox filters.
d4568cb 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Fix filter on participant test.
985e311 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Use correct command on Apple to check local DNS name.
35ad112 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Fix typo.
41a14fd 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Fix filter in LocatorTests.
b5a5bfa 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Filter with grep in mac.
ebdbd1c 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #20652. Improve status messages.
5b9f119 
Signed-off-by: Miguel Company <[email protected]>
@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 5, 2024

rebase

✅ Branch has been successfully rebased

@github-actions github-actions bot added the ci-pending PR which CI is running label Apr 5, 2024
@MiguelCompany
Copy link
Member Author

@richiprosima please test this

@MiguelCompany
Copy link
Member Author

@Mergifyio backport 2.6.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 5, 2024 •
edited
Loading

backport 2.6.x

✅ Backports have been created

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

4 similar comments
@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 7a77988 into 2.10.x Apr 7, 2024
16 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/20652/2.10.x branch April 7, 2024 11:11
mergify bot pushed a commit that referenced this pull request Apr 7, 2024
@MiguelCompany @mergify
Fix test filtering in CMake files (#4650)
4f4fb28 
* Refs #20652. Fix windows command to check local DNS name.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Correctly combine blackbox filters.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Fix filter on participant test.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Use correct command on Apple to check local DNS name.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Fix typo.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Fix filter in LocatorTests.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Filter with grep in mac.

Signed-off-by: Miguel Company <[email protected]>

* Refs #20652. Improve status messages.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 7a77988)

# Conflicts:
#	cmake/common/gtest.cmake
#	test/CMakeLists.txt
#	test/blackbox/CMakeLists.txt
#	test/unittest/dds/participant/CMakeLists.txt
#	test/unittest/utils/CMakeLists.txt
@mergify mergify bot mentioned this pull request Apr 7, 2024
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elianalf elianalf Awaiting requested review from elianalf

Assignees
No one assigned
Labels
ci-pending PR which CI is running no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v2.10.4
Development

Successfully merging this pull request may close these issues.
2 participants
@MiguelCompany @elianalf