diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3814e4..66aa518 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,7 @@ jobs: echo "MESON_OPTIONS=-Dbuild_serial_interface=true" >> ${GITHUB_ENV} echo "MESON_FALLBACK_OPTIONS=-Dfortuno:build_serial_interface=true" >> ${GITHUB_ENV} echo "INTERFACE=serial" >> ${GITHUB_ENV} + echo "RUN_PREFIX=" >> ${GITHUB_ENV} - name: Setup mpi interface options if: ${{ contains(matrix.interface, 'mpi') }} @@ -134,6 +135,7 @@ jobs: echo "MESON_OPTIONS=-Dbuild_mpi_interface=true" >> ${GITHUB_ENV} echo "MESON_FALLBACK_OPTIONS=-Dfortuno:build_mpi_interface=true" >> ${GITHUB_ENV} echo "INTERFACE=mpi" >> ${GITHUB_ENV} + echo "RUN_PREFIX=mpirun -n 2" - name: Setup build tools run: | @@ -150,8 +152,8 @@ jobs: run: | CMAKE_PREFIX_PATH=${INSTALL_DIR} cmake -B ${BUILD_DIR} -G Ninja test/export/${INTERFACE} cmake --build ${BUILD_DIR} - ${BUILD_DIR}/app/testapp - ${BUILD_DIR}/app/testapp_fypp + ${RUN_PREFIX} ${BUILD_DIR}/app/testapp + ${RUN_PREFIX} ${BUILD_DIR}/app/testapp_fypp rm -rf ${BUILD_DIR} - name: Test fpm export @@ -168,7 +170,7 @@ jobs: cd test/export/${INTERFACE} meson setup --wrap-mode nofallback ${BUILD_DIR} ninja -C ${BUILD_DIR} - ${BUILD_DIR}/testapp + ${RUN_PREFIX} ${BUILD_DIR}/testapp rm -rf ./${BUILD_DIR} - name: Test Meson subproject export @@ -183,5 +185,5 @@ jobs: echo -e "url=file://${FORTUNO_DIR}\nrevision=${GIT_REV}\n" >> subprojects/fortuno.wrap meson setup ${MESON_FALLBACK_OPTIONS} --wrap-mode forcefallback ${BUILD_DIR} ninja -C ${BUILD_DIR} - ${BUILD_DIR}/testapp + ${RUN_PREFIX} ${BUILD_DIR}/testapp rm -rf subprojects ${BUILD_DIR}