Skip to content

[23637] Avoid PROJECT_SOURCE_DIR and make_unique when building blackbox tests (backport #6140) #6145

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

Merged
MiguelCompany merged 2 commits into from
Mar 10, 2026
+6 −4
Merged

[23637] Avoid PROJECT_SOURCE_DIR and make_unique when building blackbox tests (backport #6140) #6145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c7d60a
Avoid `PROJECT_SOURCE_DIR` and `make_unique` when building blackbox t…
MiguelCompany Nov 4, 2025
bbe1e70
Fix conflicts
MiguelCompany Mar 6, 2026
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
4 changes: 2 additions & 2 deletions test/blackbox/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ if(FASTDDS_PIM_API_TESTS)
)
target_include_directories(BlackboxTests_DDS_PIM PRIVATE
${Asio_INCLUDE_DIR}
api/dds-pim
${PROJECT_SOURCE_DIR}/test/utils)
${CMAKE_CURRENT_SOURCE_DIR}/api/dds-pim
${CMAKE_CURRENT_SOURCE_DIR}/../utils)
target_link_libraries(BlackboxTests_DDS_PIM
fastdds
fastcdr
Expand Down
6 changes: 4 additions & 2 deletions test/blackbox/common/BlackboxTestsDeadlineQos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ TEST_P(DeadlineQos, KeyedTopicBestEffortReaderVolatileWriterSetDeadline)
TEST_P(DeadlineQos, ZeroDeadlinePeriodWriter)
{
auto observer = std::make_shared<eprosima::fastdds::testing::LogCounterObserver>(/*store=*/ false);
auto consumer = std::make_unique<eprosima::fastdds::testing::LogCounterConsumer>(observer);
std::unique_ptr<eprosima::fastdds::testing::LogCounterConsumer> consumer;
consumer.reset(new eprosima::fastdds::testing::LogCounterConsumer(observer));

fastlog::ClearConsumers();
fastlog::RegisterConsumer(std::move(consumer));
Expand Down Expand Up @@ -420,7 +421,8 @@ TEST_P(DeadlineQos, ZeroDeadlinePeriodReader)
ASSERT_TRUE(writer.isInitialized());

auto observer = std::make_shared<eprosima::fastdds::testing::LogCounterObserver>(/*store=*/ false);
auto consumer = std::make_unique<eprosima::fastdds::testing::LogCounterConsumer>(observer);
std::unique_ptr<eprosima::fastdds::testing::LogCounterConsumer> consumer;
consumer.reset(new eprosima::fastdds::testing::LogCounterConsumer(observer));

fastlog::ClearConsumers();
fastlog::RegisterConsumer(std::move(consumer));
Expand Down
Loading