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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
May 28, 2024
Merged

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

merged 3 commits into from
May 28, 2024

Commits on May 22, 2024

  1. Use absolute paths when loading XML files (#4751) 

    * 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
    @Mario-DL @mergify
    Mario-DL authored and mergify[bot] committed May 22, 2024
    Configuration menu
    Copy the full SHA
    7a7703b View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Fix conflicts 

    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    @Mario-DL
    Mario-DL committed May 27, 2024
    Configuration menu
    Copy the full SHA
    e14e566 View commit details
    Browse the repository at this point in the history

  2. Avoid minmax warning in windows 

    Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
    @Mario-DL
    Mario-DL committed May 27, 2024
    Configuration menu
    Copy the full SHA
    963e9a5 View commit details
    Browse the repository at this point in the history