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

Fix singleton in StatisticsBackendData [15841] #172

Merged
merged 13 commits into from
Oct 24, 2022
Merged

Fix singleton in StatisticsBackendData [15841] #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1e872bf
Refs #15841: Fix singleton in StatisticsBackendData
Oct 6, 2022
cc172a8
Refs #15841: Fix Singleton instance management (with other singleton …
Oct 6, 2022
dc1cfa3
Refs #15841: Fix tests that set monitors ad-hoc and then they fail in…
Oct 7, 2022
9966ae8
Refs #15841: Change gtest version
Oct 7, 2022
c77286a
Refs #15841: Change DomainParticipantFactory from Mock to Fake
Oct 10, 2022
fb37f6a
Refs #15841: Fix failure handle in Monitor creation
Oct 11, 2022
86b6207
Refs #15841: Fix error in test mocking entities
Oct 11, 2022
aacf5cc
Refs #15841: Return to monitor creation and add error handle
Oct 13, 2022
412854d
Refs #15841: apply suggestions
Oct 21, 2022
2e4288c
Refs #15841: apply new suggestions
Oct 24, 2022
049cf32
Refs #15841: apply small suggestions
Oct 24, 2022
642e20a
Refs #15841: uncrustify
Oct 24, 2022
cf468ca
Update src/cpp/StatisticsBackendData.hpp
MiguelCompany Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refs #15841: Change gtest version 
Signed-off-by: jparisu <javierparis@eprosima.com>
  • Loading branch information
jparisu committed Oct 18, 2022
commit 9966ae851f9f73274feedb33bfdd6db3f2923eef
10 changes: 0 additions & 10 deletions .github/actions/fetch-fastdds-repos/action.yml
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/install-gtest/action.yml
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/ci.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repositories:

foonathan_memory_vendor:
type: git
url: https://github.com/eProsima/foonathan_memory_vendor.git
version: master

fastcdr:
type: git
url: https://github.com/eProsima/Fast-CDR.git
version: master

fastdds:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: master

googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.12.1
25 changes: 13 additions & 12 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos

- name: Update colcon mixin
run: |
Expand All @@ -111,10 +109,17 @@ jobs:
colcon mixin update default
continue-on-error: true

- name: Build gtest
run: |
colcon build \
--event-handlers=console_direct+ \
--packages-select googletest-distribution

- name: Build workspace
run: |
cat src/Fast-DDS-statistics-backend/.github/workflows/test.meta
colcon build \
--packages-skip googletest-distribution \
--event-handlers=console_direct+ \
--metas src/Fast-DDS-statistics-backend/.github/workflows/test.meta

Expand Down Expand Up @@ -187,14 +192,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos

- name: Update colcon mixin
run: |
Expand Down Expand Up @@ -299,14 +302,12 @@ jobs:
- name: Install apt packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-apt-packages

- name: Install GTest
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-gtest

- name: Install Python packages
uses: ./src/Fast-DDS-statistics-backend/.github/actions/install-python-packages

- name: Fetch eProsima dependencies
uses: ./src/Fast-DDS-statistics-backend/.github/actions/fetch-fastdds-repos
run: |
vcs import src < ./src/Fast-DDS-statistics-backend/.github/workflows/ci.repos

- name: Build workspace
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/database/database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,7 +1984,7 @@ bool Database::is_entity_present(
auto result = get_entity(entity_id);
return result.operator bool();
}
catch(const BadParameter& e)
catch(const BadParameter&)
{
return false;
}
Expand Down
2 changes: 0 additions & 2 deletions test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>

#include <boost/interprocess/sync/interprocess_mutex.hpp>

#include <fastdds/dds/core/status/StatusMask.hpp>
#include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
#include <fastrtps/types/TypesBase.h>
Expand Down