Skip to content

Commit 7673b74

Browse files
committed
Merge branch 'feature/21886/playground' of https://github.com/eProsima/Fast-DDS into feature/21886/playground
2 parents d7d585f + fc46083 commit 7673b74

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.github/workflows/reusable-windows-ci.yml

+15
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ jobs:
137137
run:
138138
choco install visualstudio2019buildtools --package-parameters "--includeRecommended --includeOptional --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" --no-progress
139139

140+
- name: Install VCTools for Dumpbin
141+
shell: pwsh
142+
run:
143+
choco install visualstudio2019buildtools --package-parameters "--includeRecommended --includeOptional --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64" --no-progress
144+
140145
- name: Build
141146
id: build
142147
continue-on-error: false
@@ -166,6 +171,16 @@ jobs:
166171
workspace: ${{ github.workspace }}
167172
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}
168173

174+
- name: Run Dumpbin
175+
shell: pwsh
176+
run:
177+
ls ${{ github.workspace }}\build\fastdds\examples\cpp\;ls ${{ github.workspace }}\build\fastdds\examples\cpp\hello_world; ls ${{ github.workspace }}\build\fastdds\examples\cpp\hello_world\RelWithDebInfo; C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\BuildTools\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\dumpbin.exe /DEPENDENTS ${{ github.workspace }}\build\fastdds\examples\cpp\hello_world\RelWithDebInfo\hello_world.exe
178+
179+
- name: Run Docker Compose
180+
shell: pwsh
181+
run:
182+
C:/Windows/System32/docker.exe compose -f build\fastdds\test\examples\hello_world\hello_world.compose.yml up
183+
169184
- name: Test summary
170185
uses: eProsima/eProsima-CI/windows/junit_summary@v0
171186
if: ${{ !cancelled() && !contains(github.event.pull_request.labels.*.name, 'no-test') }}

test/examples/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,22 @@ elseif(WIN32)
4949

5050
# Temporary, in the is installed here
5151
set(SHELL_EXECUTABLE "C:/Program Files/PowerShell/latest/pwsh.exe")
52-
52+
5353
set(FILE_EXTENSION ".exe")
5454
set(DOCKER_IMAGE_NAME "windows-testing")
55-
55+
5656
cmake_path(GET fastcdr_LIB_DIR PARENT_PATH fastcdr_INSTALL_DIR)
5757

5858
set(WIN_DOCKERFILE ${CMAKE_CURRENT_LIST_DIR}/windows/Dockerfile)
59+
60+
message(STATUS "PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR}")
61+
5962
# Generate image for testing
6063
add_custom_target(
6164
windows_docker_image_testing_generation
6265
ALL
6366
# Launch the docker build command using the build context.
64-
COMMAND ${DOCKER_EXECUTABLE} build
67+
COMMAND ${DOCKER_EXECUTABLE} build
6568
--tag ${DOCKER_IMAGE_NAME}
6669
--file ${WIN_DOCKERFILE}
6770
${CMAKE_CURRENT_LIST_DIR}

test/examples/hello_world.compose.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,20 @@ services:
1717
image: @DOCKER_IMAGE_NAME@
1818
volumes:
1919
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
20-
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR@/bin
21-
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/bin
22-
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
2320
environment:
2421
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
25-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/Release
22+
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo
2623
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
27-
command: @SHELL_EXECUTABLE@ -c "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ subscriber --waitset --samples 30"
24+
command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";"
2825

2926
subscriber-publisher:
3027
image: @DOCKER_IMAGE_NAME@
3128
volumes:
3229
- @PROJECT_BINARY_DIR@:@PROJECT_BINARY_DIR@
33-
- @fastcdr_INSTALL_DIR@/bin:@fastcdr_INSTALL_DIR@/bin
34-
- @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/bin
35-
@TINYXML2_LIB_DIR_COMPOSE_VOLUME@
3630
environment:
3731
PATH: C:/Program Files/OpenSSL-Win64;@CMAKE_INSTALL_PREFIX@/bin;@fastcdr_INSTALL_DIR@/bin;C:/Windows/System32;C:/Windows/System32/downlevel;
38-
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/Release
32+
EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/RelWithDebInfo
3933
FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
40-
command: @SHELL_EXECUTABLE@ -c "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ publisher --samples 30 &" "& $$Env:EXAMPLE_DIR/hello_world@FILE_EXTENSION@ subscriber --samples 30; Receive-Job 1 -Wait"
34+
command: @SHELL_EXECUTABLE@ -c "& ls;echo "Testing STDOUT";"
4135
depends_on:
4236
- waitset-subscriber

0 commit comments

Comments
 (0)