-
Notifications
You must be signed in to change notification settings - Fork 783
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
[10173] Use absolute paths when loading XML files (backport #4751) #4830
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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: # include/fastrtps/xmlparser/XMLParserCommon.h # src/cpp/rtps/xmlparser/XMLParser.cpp # src/cpp/rtps/xmlparser/XMLParserCommon.cpp # src/cpp/rtps/xmlparser/XMLProfileManager.cpp # test/unittest/xmlparser/CMakeLists.txt
Cherry-pick of 0919ff2 has failed:
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 |
12 tasks
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@richiprosima Please test this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 importingwindows.h
a2275 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
This is an automatic backport of pull request #4751 done by [Mergify](https://mergify.com).