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.

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

Add test for a union using an alias with scope #5330

Merged
merged 4 commits into from
Oct 25, 2024
Merged

Conversation

richiware
Copy link
Member

@richiware richiware commented Oct 16, 2024

Description

Add tests for the regression type for issue #21823 in eProsima/Fast-DDS-Gen#411.

Depends on:

@Mergifyio backport 3.1.x 3.0.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
  • 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)
  • N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • N/A 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.

Signed-off-by: Ricardo González Moreno <[email protected]>
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 18, 2024
@MiguelCompany MiguelCompany modified the milestones: v3.1.1, v3.2.0 Oct 25, 2024
@MiguelCompany
Copy link
Member

@Mergifyio backport 3.1.x 3.0.x

Copy link
Contributor

mergify bot commented Oct 25, 2024

backport 3.1.x 3.0.x

❌ No backport have been created

Git reported the following error:

Auto-merging include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
Auto-merging src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
Auto-merging src/cpp/statistics/types/monitorservice_types.hpp
Auto-merging src/cpp/statistics/types/types.hpp
Auto-merging test/blackbox/types/core/core_types.hpp
Auto-merging test/blackbox/types/statistics/monitorservice_types.hpp
Auto-merging test/blackbox/types/statistics/types.hpp
Auto-merging test/dds-types-test/declarations.hpp
Auto-merging test/dds-types-test/external.hpp
Auto-merging test/dds-types-test/unions.hpp
CONFLICT (content): Merge conflict in test/dds-types-test/unions.hpp
Auto-merging test/dds-types-test/unionsCdrAux.hpp
CONFLICT (content): Merge conflict in test/dds-types-test/unionsCdrAux.hpp
Auto-merging test/dds-types-test/unionsCdrAux.ipp
CONFLICT (content): Merge conflict in test/dds-types-test/unionsCdrAux.ipp
Auto-merging test/dds-types-test/unionsPubSubTypes.cxx
CONFLICT (content): Merge conflict in test/dds-types-test/unionsPubSubTypes.cxx
Auto-merging test/dds-types-test/unionsPubSubTypes.hpp
CONFLICT (content): Merge conflict in test/dds-types-test/unionsPubSubTypes.hpp
Auto-merging test/dds-types-test/unionsTypeObjectSupport.cxx
CONFLICT (content): Merge conflict in test/dds-types-test/unionsTypeObjectSupport.cxx
Auto-merging test/dds-types-test/unionsTypeObjectSupport.hpp
CONFLICT (content): Merge conflict in test/dds-types-test/unionsTypeObjectSupport.hpp
Auto-merging test/dds/xtypes/TypeLookupServicePublisher.h
Auto-merging test/dds/xtypes/TypeLookupServiceSubscriber.h
Auto-merging test/dds/xtypes/TypesTestsCases/Cases_unions.json
Auto-merging test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp
CONFLICT (content): Merge conflict in test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp
Auto-merging test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp
Auto-merging test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp
Failed to merge submodule thirdparty/dds-types-test (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/dds-types-test
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - come back to superproject and run:

      git add thirdparty/dds-types-test

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject
error: could not apply 5c5a7c0b1... Add test for a union using an alias with scope  (#5330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@richiware richiware merged commit 5c5a7c0 into master Oct 25, 2024
16 of 17 checks passed
@richiware richiware deleted the bugfix/21823 branch October 25, 2024 07:03
mergify bot pushed a commit that referenced this pull request Oct 25, 2024
* Refs #21823. Update submodule and regenerate code

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21823. Add dynamic types test.

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21823. Regenerate TypeLookupService tests

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21823. Apply suggestions

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
(cherry picked from commit 5c5a7c0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants