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.

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

[20652] Fix test filtering in CMake files (backport #4650) #4665

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 7, 2024

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.

This is an automatic backport of pull request #4650 done by [Mergify](https://mergify.com).

* Refs #20652. Fix windows command to check local DNS name.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Correctly combine blackbox filters.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix filter on participant test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

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

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix typo.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Fix filter in LocatorTests.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Filter with grep in mac.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20652. Improve status messages.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(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
Copy link
Contributor Author

mergify bot commented Apr 7, 2024

Cherry-pick of 7a77988 has failed:

On branch mergify/bp/2.6.x/pr-4650
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 7a77988a3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmake/common/gtest.cmake
	both modified:   test/CMakeLists.txt
	both modified:   test/blackbox/CMakeLists.txt
	both modified:   test/unittest/dds/participant/CMakeLists.txt
	both modified:   test/unittest/utils/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 7, 2024
@mergify mergify bot mentioned this pull request Apr 7, 2024
9 tasks
@MiguelCompany MiguelCompany added this to the v2.6.8 milestone Apr 7, 2024
@Mario-DL Mario-DL modified the milestones: v2.6.8, v2.6.9 Apr 23, 2024
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4650 branch May 13, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants