Skip to content

[24338] Improve windows tests (backport #6373)#6377

Merged
MiguelCompany merged 2 commits into
2.14.xfrom
mergify/bp/2.14.x/pr-6373
Jul 13, 2026
Merged

[24338] Improve windows tests (backport #6373)#6377
MiguelCompany merged 2 commits into
2.14.xfrom
mergify/bp/2.14.x/pr-6373

Conversation

@mergify

@mergify mergify Bot commented Apr 27, 2026

Copy link
Copy Markdown
Contributor

Description

This PR improves windows tests by making system tests more robust, improving WriterHistory tests teardown and moving the copy of IDL to setup.

@Mergifyio backport 3.4.x 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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.

  • 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 #6373 done by [Mergify](https://mergify.com).

* Refs #24338: Fix System tests

* Refs #24338: Fix IDL tests

* Refs #24338: Improve deletion of WriterHistoryTests

---------

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
(cherry picked from commit e8294c0)

# Conflicts:
#	test/feature/idl_parser/CMakeLists.txt
#	test/system/tools/fds/tests.py
#	test/unittest/rtps/history/WriterHistoryTests.cpp
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Apr 27, 2026
@mergify

mergify Bot commented Apr 27, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of e8294c0 has failed:

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

You are currently cherry-picking commit e8294c00d.
  (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)

Changes to be committed:
	modified:   test/system/tools/fds/CMakeLists.txt
	modified:   test/system/tools/fds/launcher.ps1

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/feature/idl_parser/CMakeLists.txt
	both modified:   test/system/tools/fds/tests.py
	both modified:   test/unittest/rtps/history/WriterHistoryTests.cpp

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 v2.14.7 milestone Apr 27, 2026
@mergify mergify Bot mentioned this pull request Apr 27, 2026
11 tasks
Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>
@cferreiragonz
cferreiragonz force-pushed the mergify/bp/2.14.x/pr-6373 branch from 632bc0c to 305fa21 Compare April 27, 2026 14:43
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Apr 27, 2026
@emiliocuestaf
emiliocuestaf requested review from richiprosima and removed request for richiprosima June 26, 2026 06:35
@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 Jun 30, 2026
@MiguelCompany
MiguelCompany merged commit eed8203 into 2.14.x Jul 13, 2026
34 of 37 checks passed
@MiguelCompany
MiguelCompany deleted the mergify/bp/2.14.x/pr-6373 branch July 13, 2026 07:16
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.

2 participants