Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ACanisLupus committed Oct 29, 2024
1 parent 4fc1641 commit 80419f5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ jobs:
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
cmake -GNinja
-B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
Expand Down
10 changes: 3 additions & 7 deletions test/TestIoBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
using namespace DsVeosCoSim;
using namespace testing;

namespace {

auto coSimTypes = testing::Values(CoSimType::Client, CoSimType::Server);

auto connectionKinds = testing::Values(ConnectionKind::Local, ConnectionKind::Remote);
auto ioBufferConnectionKinds = testing::Values(ConnectionKind::Local, ConnectionKind::Remote);

auto dataTypes = testing::Values(DsVeosCoSim_DataType_Bool,
DsVeosCoSim_DataType_Int8,
Expand Down Expand Up @@ -114,7 +112,7 @@ class TestIoBufferWithCoSimType : public testing::TestWithParam<std::tuple<CoSim

INSTANTIATE_TEST_SUITE_P(Test,
TestIoBufferWithCoSimType,
testing::Combine(coSimTypes, connectionKinds),
testing::Combine(coSimTypes, ioBufferConnectionKinds),
[](const testing::TestParamInfo<std::tuple<CoSimType, ConnectionKind>>& info) {
return fmt::format("{}_{}",
ToString(std::get<0>(info.param)),
Expand All @@ -141,7 +139,7 @@ class TestIoBuffer : public testing::TestWithParam<std::tuple<CoSimType, Connect
INSTANTIATE_TEST_SUITE_P(
,
TestIoBuffer,
testing::Combine(coSimTypes, connectionKinds, dataTypes),
testing::Combine(coSimTypes, ioBufferConnectionKinds, dataTypes),
[](const testing::TestParamInfo<std::tuple<CoSimType, ConnectionKind, DsVeosCoSim_DataType>>& info) {
return fmt::format("{}_{}_{}",
ToString(std::get<0>(info.param)),
Expand Down Expand Up @@ -712,5 +710,3 @@ TEST_P(TestIoBuffer, NoNewEventIfVariableSizedDataDoesNotChangeWithSharedMemory)
// Act and assert
TransferWithEvents(writerIoBuffer, readerIoBuffer, {});
}

} // namespace

0 comments on commit 80419f5

Please sign in to comment.