Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 4, 2025

Description

This helps building tests in Fast DDS Pro by removing usage of PROJECT_SOURCE_DIR in the CMakeLists.txt file of the blackbox tests.

It also removes calls to make_unique since we try to limit ourselves to C++11.

@Mergifyio backport 3.3.x 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A: The code follows the style guidelines of this project.

  • 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

    • See related PR in Fast DDS Pro
  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #6140 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 4, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 4, 2025

Cherry-pick of 60f83e5 has failed:

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

You are currently cherry-picking commit 60f83e5e.
  (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:   test/blackbox/CMakeLists.txt
	both modified:   test/blackbox/common/BlackboxTestsDeadlineQos.cpp

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

@MiguelCompany MiguelCompany added this to the v3.3.1 milestone Nov 4, 2025
@cferreiragonz cferreiragonz removed the conflicts Backport PR wich git cherry pick failed label Nov 18, 2025
…ests (#6140)

* Refs #23637. Avoid `PROJECT_SOURCE_DIR` when building blackbox tests.

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

* Refs #23637. Remove calls to `make_unique`.

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

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 60f83e5)
@cferreiragonz cferreiragonz force-pushed the mergify/bp/3.3.x/pr-6140 branch from a2bebbd to 90d17c4 Compare November 18, 2025 10:04
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 18, 2025
@cferreiragonz cferreiragonz removed the request for review from richiprosima November 18, 2025 10:05
@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Nov 24, 2025
@MiguelCompany MiguelCompany merged commit f963e68 into 3.3.x Nov 24, 2025
41 of 46 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.3.x/pr-6140 branch November 24, 2025 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants