From a026a861e0ac7239febdeea681e0ff8cc292f4a0 Mon Sep 17 00:00:00 2001 From: Dorian Peron Date: Mon, 7 Apr 2025 10:14:31 +0200 Subject: [PATCH] Remove old coverage-related scripts --- util/build-code_coverage.BAT | 59 ------------------------------ util/build-code_coverage.sh | 71 ------------------------------------ util/show-code_coverage.BAT | 16 -------- util/show-code_coverage.sh | 40 -------------------- 4 files changed, 186 deletions(-) delete mode 100644 util/build-code_coverage.BAT delete mode 100755 util/build-code_coverage.sh delete mode 100644 util/show-code_coverage.BAT delete mode 100755 util/show-code_coverage.sh diff --git a/util/build-code_coverage.BAT b/util/build-code_coverage.BAT deleted file mode 100644 index 25d3f618b..000000000 --- a/util/build-code_coverage.BAT +++ /dev/null @@ -1,59 +0,0 @@ -@setLocal -@echo off -set "ERRORLEVEL=" - -@rem ::# spell-checker:ignore (abbrevs/acronyms) gcno -@rem ::# spell-checker:ignore (CMD) COMSPEC ERRORLEVEL -@rem ::# spell-checker:ignore (jargon) toolchain -@rem ::# spell-checker:ignore (rust) Ccodegen Cinline Coverflow Cpanic RUSTC RUSTDOCFLAGS RUSTFLAGS RUSTUP Zpanic -@rem ::# spell-checker:ignore (utils) genhtml grcov lcov sccache uutils - -@rem ::# ref: https://github.com/uutils/coreutils/pull/1476 - -set "FEATURES_OPTION=--features feat_os_windows" - -cd "%~dp0.." -call echo [ "%CD%" ] - -for /f "tokens=*" %%G in ('%~dp0\show-utils.BAT %FEATURES_OPTION%') do set UTIL_LIST=%%G -REM echo UTIL_LIST=%UTIL_LIST% -set "CARGO_INDIVIDUAL_PACKAGE_OPTIONS=" -for %%H in (%UTIL_LIST%) do ( - if DEFINED CARGO_INDIVIDUAL_PACKAGE_OPTIONS call set "CARGO_INDIVIDUAL_PACKAGE_OPTIONS=%%CARGO_INDIVIDUAL_PACKAGE_OPTIONS%% " - call set "CARGO_INDIVIDUAL_PACKAGE_OPTIONS=%%CARGO_INDIVIDUAL_PACKAGE_OPTIONS%%-puu_%%H" -) -REM echo CARGO_INDIVIDUAL_PACKAGE_OPTIONS=%CARGO_INDIVIDUAL_PACKAGE_OPTIONS% - -REM call cargo clean - -set "CARGO_INCREMENTAL=0" -set "RUSTC_WRAPPER=" &@REM ## NOTE: RUSTC_WRAPPER=='sccache' breaks code coverage calculations (uu_*.gcno files are not created during build) -@REM set "RUSTFLAGS=-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads" -set "RUSTFLAGS=-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" -set "RUSTDOCFLAGS=-Cpanic=abort" -set "RUSTUP_TOOLCHAIN=nightly-gnu" -call cargo build %FEATURES_OPTION% -call cargo test --no-run %FEATURES_OPTION% -call cargo test --quiet %FEATURES_OPTION% -call cargo test --quiet %FEATURES_OPTION% %CARGO_INDIVIDUAL_PACKAGE_OPTIONS% - -if NOT DEFINED COVERAGE_REPORT_DIR set COVERAGE_REPORT_DIR=target\debug\coverage-win -call rm -r "%COVERAGE_REPORT_DIR%" 2>NUL - -set GRCOV_IGNORE_OPTION=--ignore build.rs --ignore "/*" --ignore "[A-Za-z]:/*" --ignore "C:/Users/*" -set GRCOV_EXCLUDE_OPTION=--excl-br-line "^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()" -@rem ::# * build LCOV coverage file -REM echo call grcov . --output-type lcov --output-path "%COVERAGE_REPORT_DIR%/../lcov.info" --branch %GRCOV_IGNORE_OPTION% %GRCOV_EXCLUDE_OPTION% -call grcov . --output-type lcov --output-path "%COVERAGE_REPORT_DIR%/../lcov.info" --branch %GRCOV_IGNORE_OPTION% %GRCOV_EXCLUDE_OPTION% -@rem ::# * build HTML -@rem ::# -- use `genhtml` if available for display of additional branch coverage information -set "ERRORLEVEL=" -call genhtml --version 2>NUL 1>&2 -if NOT ERRORLEVEL 1 ( - echo call genhtml target/debug/lcov.info --prefix "%CD%" --output-directory "%COVERAGE_REPORT_DIR%" --branch-coverage --function-coverage ^| grep ": [0-9]" - call genhtml target/debug/lcov.info --prefix "%CD%" --output-directory "%COVERAGE_REPORT_DIR%" --branch-coverage --function-coverage | grep ": [0-9]" -) else ( - echo call grcov . --output-type html --output-path "%COVERAGE_REPORT_DIR%" --branch %GRCOV_IGNORE_OPTION% - call grcov . --output-type html --output-path "%COVERAGE_REPORT_DIR%" --branch %GRCOV_IGNORE_OPTION% -) -if ERRORLEVEL 1 goto _undefined_ 2>NUL || @for %%G in ("%COMSPEC%") do @title %%nG & @"%COMSPEC%" /d/c exit %ERRORLEVEL% diff --git a/util/build-code_coverage.sh b/util/build-code_coverage.sh deleted file mode 100755 index bbe4abaab..000000000 --- a/util/build-code_coverage.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -# spell-checker:ignore (abbrevs/acronyms) HTML gcno llvm -# spell-checker:ignore (jargon) toolchain -# spell-checker:ignore (rust) Ccodegen Cinline Coverflow Cpanic RUSTC RUSTDOCFLAGS RUSTFLAGS RUSTUP Zpanic -# spell-checker:ignore (shell) OSID OSTYPE esac -# spell-checker:ignore (utils) genhtml grcov lcov greadlink readlink sccache shellcheck uutils - -FEATURES_OPTION="--features feat_os_unix" - -# Use GNU coreutils for readlink on *BSD -case "$OSTYPE" in - *bsd*) - READLINK="greadlink" - ;; - *) - READLINK="readlink" - ;; -esac - -ME="${0}" -ME_dir="$(dirname -- "$("${READLINK}" -fm -- "${ME}")")" -REPO_main_dir="$(dirname -- "${ME_dir}")" - -cd "${REPO_main_dir}" && - echo "[ \"$PWD\" ]" - -#shellcheck disable=SC2086 -UTIL_LIST=$("${ME_dir}"/show-utils.sh ${FEATURES_OPTION}) -CARGO_INDIVIDUAL_PACKAGE_OPTIONS="" -for UTIL in ${UTIL_LIST}; do - if [ -n "${CARGO_INDIVIDUAL_PACKAGE_OPTIONS}" ]; then CARGO_INDIVIDUAL_PACKAGE_OPTIONS="${CARGO_INDIVIDUAL_PACKAGE_OPTIONS} "; fi - CARGO_INDIVIDUAL_PACKAGE_OPTIONS="${CARGO_INDIVIDUAL_PACKAGE_OPTIONS}-puu_${UTIL}" -done -# echo "CARGO_INDIVIDUAL_PACKAGE_OPTIONS=${CARGO_INDIVIDUAL_PACKAGE_OPTIONS}" - -# cargo clean - -export CARGO_INCREMENTAL=0 -export RUSTC_WRAPPER="" ## NOTE: RUSTC_WRAPPER=='sccache' breaks code coverage calculations (uu_*.gcno files are not created during build) -# export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads" -export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort" -export RUSTDOCFLAGS="-Cpanic=abort" -export RUSTUP_TOOLCHAIN="nightly-gnu" -#shellcheck disable=SC2086 -{ - cargo build ${FEATURES_OPTION} - cargo test --no-run ${FEATURES_OPTION} - cargo test --quiet ${FEATURES_OPTION} - cargo test --quiet ${FEATURES_OPTION} ${CARGO_INDIVIDUAL_PACKAGE_OPTIONS} -} - -export COVERAGE_REPORT_DIR -if [ -z "${COVERAGE_REPORT_DIR}" ]; then COVERAGE_REPORT_DIR="${REPO_main_dir}/target/debug/coverage-nix"; fi -rm -r "${COVERAGE_REPORT_DIR}" 2>/dev/null -mkdir -p "${COVERAGE_REPORT_DIR}" - -## NOTE: `grcov` is not accepting environment variable contents as options for `--ignore` or `--excl_br_line` -# export GRCOV_IGNORE_OPTION="--ignore build.rs --ignore '/*' --ignore '[A-Za-z]:/*' --ignore 'C:/Users/*'" -# export GRCOV_EXCLUDE_OPTION="--excl-br-line '^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()'" -# * build LCOV coverage file -grcov . --output-type lcov --output-path "${COVERAGE_REPORT_DIR}/../lcov.info" --branch --ignore build.rs --ignore '/*' --ignore '[A-Za-z]:/*' --ignore 'C:/Users/*' --excl-br-line '^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()' -# * build HTML -# -- use `genhtml` if available for display of additional branch coverage information -if genhtml --version 2>/dev/null 1>&2; then - genhtml "${COVERAGE_REPORT_DIR}/../lcov.info" --output-directory "${COVERAGE_REPORT_DIR}" --branch-coverage --function-coverage | grep ": [0-9]" -else - grcov . --output-type html --output-path "${COVERAGE_REPORT_DIR}" --branch --ignore build.rs --ignore '/*' --ignore '[A-Za-z]:/*' --ignore 'C:/Users/*' --excl-br-line '^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()' -fi -# shellcheck disable=SC2181 -if [ $? -ne 0 ]; then exit 1; fi diff --git a/util/show-code_coverage.BAT b/util/show-code_coverage.BAT deleted file mode 100644 index 222fff382..000000000 --- a/util/show-code_coverage.BAT +++ /dev/null @@ -1,16 +0,0 @@ -@setLocal -@echo off - -@rem:: # spell-checker:ignore (shell/CMD) COMSPEC ERRORLEVEL - -set "ME_dir=%~dp0." -set "REPO_main_dir=%ME_dir%\.." - -set "ERRORLEVEL=" -set "COVERAGE_REPORT_DIR=%REPO_main_dir%\target\debug\coverage-win" - -call "%ME_dir%\build-code_coverage.BAT" -if ERRORLEVEL 1 goto _undefined_ 2>NUL || @for %%G in ("%COMSPEC%") do @title %%nG & @"%COMSPEC%" /d/c exit %ERRORLEVEL% - -call start "" "%COVERAGE_REPORT_DIR%"\index.html -if ERRORLEVEL 1 goto _undefined_ 2>NUL || @for %%G in ("%COMSPEC%") do @title %%nG & @"%COMSPEC%" /d/c exit %ERRORLEVEL% diff --git a/util/show-code_coverage.sh b/util/show-code_coverage.sh deleted file mode 100755 index 8c6f5e20a..000000000 --- a/util/show-code_coverage.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -# spell-checker:ignore (vars) OSID OSTYPE binfmt greadlink - -# Use GNU coreutils for readlink on *BSD -case "$OSTYPE" in - *bsd*) - READLINK="greadlink" - ;; - *) - READLINK="readlink" - ;; -esac - -ME="${0}" -ME_dir="$(dirname -- "$("${READLINK}" -fm -- "${ME}")")" -REPO_main_dir="$(dirname -- "${ME_dir}")" - -export COVERAGE_REPORT_DIR="${REPO_main_dir}/target/debug/coverage-nix" - -if ! "${ME_dir}/build-code_coverage.sh"; then exit 1; fi - -# WSL? -if [ -z "${OSID_tags}" ]; then - if [ -e '/proc/sys/fs/binfmt_misc/WSLInterop' ] && (grep '^enabled$' '/proc/sys/fs/binfmt_misc/WSLInterop' >/dev/null); then - __="wsl" - case ";${OSID_tags};" in ";;") OSID_tags="$__" ;; *";$__;"*) ;; *) OSID_tags="$__;$OSID_tags" ;; esac - unset __ - # Windows version == ... - # Release ID; see [Release ID/Version vs Build](https://winreleaseinfoprod.blob.core.windows.net/winreleaseinfoprod/en-US.html)[`@`](https://archive.is/GOj1g) - OSID_wsl_build="$(uname -r | sed 's/^[0-9.][0-9.]*-\([0-9][0-9]*\)-.*$/\1/g')" - OSID_wsl_revision="$(uname -v | sed 's/^#\([0-9.][0-9.]*\)-.*$/\1/g')" - export OSID_wsl_build OSID_wsl_revision - fi -fi - -case ";${OSID_tags};" in - *";wsl;"*) powershell.exe -c "$(wslpath -w "${COVERAGE_REPORT_DIR}"/index.html)" ;; - *) xdg-open --version >/dev/null 2>&1 && xdg-open "${COVERAGE_REPORT_DIR}"/index.html || echo "report available at '\"${COVERAGE_REPORT_DIR}\"/index.html'" ;; -esac