Skip to content
New issue

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

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

Already on GitHub? # to your account

[10173] Use absolute paths when loading XML files (backport #4751) #4828

Merged
merged 3 commits into from
May 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 22, 2024

Description

This PR forwards a refactor from the work in #1657 to master.
In addition, it solves a name collision error with the variable name INTERFACE. When importing windows.h a 2275 error : illegal use of this type as an expression was caused

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • 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

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

* Refs #10173: Add XMLLoadFile unittest

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Use absolute paths when loading XML files

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Fix windows.h INTERFACE name collision

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Avoid MINMAX windows warning as error in unittests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Use DEFAULT_FASTDDS_PROFILES for windows

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Enable internal debug in test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Force log info in the test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #10173: Correct windows FASTDDS_DEFAULT PROFILES env and include
fastdds/log instead of fastrtps

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 0919ff2)

# Conflicts:
#	src/cpp/rtps/xmlparser/XMLParser.cpp
#	src/cpp/rtps/xmlparser/XMLProfileManager.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label May 22, 2024
Copy link
Contributor Author

mergify bot commented May 22, 2024

Cherry-pick of 0919ff2 has failed:

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

You are currently cherry-picking commit 0919ff294.
  (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:   include/fastrtps/xmlparser/XMLParser.h
	modified:   include/fastrtps/xmlparser/XMLParserCommon.h
	modified:   include/fastrtps/xmlparser/XMLProfileManager.h
	modified:   src/cpp/rtps/xmlparser/XMLParserCommon.cpp
	modified:   test/unittest/dds/status/CMakeLists.txt
	modified:   test/unittest/logging/mock/MockConsumer.h
	modified:   test/unittest/xmlparser/CMakeLists.txt
	new file:   test/unittest/xmlparser/XMLLoadFileTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/xmlparser/XMLParser.cpp
	both modified:   src/cpp/rtps/xmlparser/XMLProfileManager.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

@EduPonz EduPonz added this to the v2.14.2 milestone May 23, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL force-pushed the mergify/bp/2.14.x/pr-4751 branch from 3b7d5df to e14e566 Compare May 27, 2024 10:24
@Mario-DL Mario-DL self-requested a review May 27, 2024 10:25
@EduPonz EduPonz removed the conflicts Backport PR wich git cherry pick failed label May 27, 2024
@EduPonz EduPonz self-requested a review May 27, 2024 11:00
@github-actions github-actions bot added the ci-pending PR which CI is running label May 27, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested a review from EduPonz May 27, 2024 12:23
@Mario-DL Mario-DL 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 May 28, 2024
@EduPonz EduPonz merged commit 6e850da into 2.14.x May 28, 2024
7 of 12 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.14.x/pr-4751 branch May 28, 2024 10:44
# for free to join this conversation on GitHub. Already have an account? # 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