Patch 8.2.4351

[Bram Moolenaar]

Patch 8.2.4351
Problem: No coverage is measured on MS-Windows CI.
Solution: Enable coverage on MS-Windows. (Ozaki Kiichi, closes #9750)
Files: .github/workflows/ci.yml


*** ../vim-8.2.4350/.github/workflows/ci.yml 2022-02-11 11:09:36.592868324 +0000
--- .github/workflows/ci.yml 2022-02-12 10:10:34.688049321 +0000
***************
*** 225,231 ****
do_test make ${SHADOWOPT} ${TEST}

# - name: Coveralls
! # if: matrix.coverage && success() && github.event_name != 'pull_request'
# env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# COVERALLS_PARALLEL: true
--- 225,231 ----
do_test make ${SHADOWOPT} ${TEST}

# - name: Coveralls
! # if: matrix.coverage && github.event_name != 'pull_request'
# env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# COVERALLS_PARALLEL: true
***************
*** 238,258 ****
# ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8

- name: Generate gcov files
! if: matrix.coverage && success()
run: |
cd "${SRCDIR}"
find . -type f -name '*.gcno' -exec gcov -pb {} + || true

- name: Codecov
! if: matrix.coverage && success()
uses: codecov/codecov-action@v2
with:
! flags: ${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}

- name: ASan logs
if: contains(matrix.extra, 'asan') && !cancelled()
run: |
! for f in $(grep -lR '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "${LOG_DIR}"); do
asan_symbolize -l "$f"
false # in order to fail a job
done
--- 238,258 ----
# ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8

- name: Generate gcov files
! if: matrix.coverage
run: |
cd "${SRCDIR}"
find . -type f -name '*.gcno' -exec gcov -pb {} + || true

- name: Codecov
! if: matrix.coverage
uses: codecov/codecov-action@v2
with:
! flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}

- name: ASan logs
if: contains(matrix.extra, 'asan') && !cancelled()
run: |
! for f in $(grep -lR '#[[:digit:]]* *0x[[:xdigit:]]*' "${LOG_DIR}"); do
asan_symbolize -l "$f"
false # in order to fail a job
done
***************
*** 410,415 ****
--- 410,418 ----
python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
echo "PYTHON_DIR=$python_dir" >> $GITHUB_ENV
echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
+ if ${{ matrix.toolchain == 'mingw' && matrix.arch == 'x64' && matrix.features == 'HUGE' }}; then
+ echo "COVERAGE=yes" >> $GITHUB_ENV
+ fi

- uses: msys2/setup-msys2@v2
if: matrix.toolchain == 'mingw'
***************
*** 501,507 ****
DYNAMIC_LUA=yes LUA=${LUA_DIR} \
DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
! STATIC_STDCPLUS=yes
else
mingw32-make -f Make_ming.mak -j2 \
FEATURES=${{ matrix.features }} \
--- 504,510 ----
DYNAMIC_LUA=yes LUA=${LUA_DIR} \
DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
! STATIC_STDCPLUS=yes COVERAGE=${COVERAGE}
else
mingw32-make -f Make_ming.mak -j2 \
FEATURES=${{ matrix.features }} \
***************
*** 522,527 ****
--- 525,536 ----
# name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
# path: ./artifacts

+ - name: Copy gcov data files to src2
+ if: env.COVERAGE
+ shell: msys2 {0}
+ run: |
+ find src -name '*.gcno' | tar -c -T - | tar -x -C src2 --strip-components 1
+
- name: Test
shell: cmd
timeout-minutes: 20
***************
*** 562,564 ****
--- 571,596 ----
exit 1
)
echo ::endgroup::
+
+ - name: Generate gcov files
+ if: env.COVERAGE
+ shell: msys2 {0}
+ run: |
+ cd src
+ find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+ cd ../src2
+ find . -type f -name '*.gcno' -exec gcov -pb {} + || true
+
+ - name: Codecov (gvim)
+ if: env.COVERAGE
+ uses: codecov/codecov-action@v2
+ with:
+ directory: src
+ flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}-gui
+
+ - name: Codecov (vim)
+ if: env.COVERAGE
+ uses: codecov/codecov-action@v2
+ with:
+ directory: src2
+ flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}
*** ../vim-8.2.4350/src/version.c 2022-02-11 21:13:31.055421058 +0000
--- src/version.c 2022-02-12 10:12:48.719765881 +0000
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4351,
/**/

--
This planet has -- or rather had -- a problem, which was this: most
of the people living on it were unhappy for pretty much of the time.
Many solutions were suggested for this problem, but most of these
were largely concerned with the movements of small green pieces of
paper, which is odd because on the whole it wasn't the small green
pieces of paper that were unhappy.
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///