From f75cfbdebc5920023fcafc94f33620f935d25d60 Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 6 Feb 2022 17:05:12 -0600 Subject: [PATCH] docs ~ (CICD/util) add/revise spell-checker exceptions --- .github/workflows/CICD.yml | 2 +- .github/workflows/GnuTests.yml | 2 +- util/build-code_coverage.sh | 2 +- util/build-gnu.sh | 23 +++++++++-------------- util/run-gnu-test.sh | 2 +- util/show-code_coverage.sh | 2 +- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 81147c8dc..b47540ed9 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -4,7 +4,7 @@ name: CICD # spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic Dwarnings RUSTDOCFLAGS RUSTFLAGS Zpanic # spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain # spell-checker:ignore (names) CodeCOV MacOS MinGW Peltoche rivy -# spell-checker:ignore (shell/tools) choco clippy dmake dpkg esac fakeroot gmake grcov halium lcov libssl mkdir popd printf pushd rustc rustfmt rustup shopt xargs +# spell-checker:ignore (shell/tools) choco clippy dmake dpkg esac fakeroot gmake grcov halium lcov libssl mkdir popd printf pushd rsync rustc rustfmt rustup shopt xargs # spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils gnueabihf issuecomment maint nullglob onexitbegin onexitend pell runtest tempfile testsuite uutils DESTDIR sizemulti # ToDO: [2021-06; rivy] change from `cargo-tree` to `cargo tree` once MSRV is >= 1.45 diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml index 98bb99ecd..738a80e84 100644 --- a/.github/workflows/GnuTests.yml +++ b/.github/workflows/GnuTests.yml @@ -1,6 +1,6 @@ name: GnuTests -# spell-checker:ignore (names) gnulib ; (people) Dawid Dziurla * dawidd6 ; (utils) autopoint chksum gperf pyinotify shopt texinfo ; (vars) FILESET XPASS +# spell-checker:ignore (names) gnulib ; (jargon) submodules ; (people) Dawid Dziurla * dawidd ; (utils) autopoint chksum gperf pyinotify shopt texinfo ; (vars) FILESET XPASS on: [push, pull_request] diff --git a/util/build-code_coverage.sh b/util/build-code_coverage.sh index d0f464805..083248d96 100755 --- a/util/build-code_coverage.sh +++ b/util/build-code_coverage.sh @@ -4,7 +4,7 @@ # spell-checker:ignore (jargon) toolchain # spell-checker:ignore (rust) Ccodegen Cinline Coverflow Cpanic RUSTC RUSTDOCFLAGS RUSTFLAGS RUSTUP Zpanic # spell-checker:ignore (shell) OSID esac -# spell-checker:ignore (utils) genhtml grcov lcov readlink sccache uutils +# spell-checker:ignore (utils) genhtml grcov lcov readlink sccache shellcheck uutils FEATURES_OPTION="--features feat_os_unix" diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 8f6e431a6..1589188b3 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -1,6 +1,6 @@ #!/bin/bash -# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall gnulib inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode ; (vars/env) BUILDDIR SRCDIR +# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall gnulib inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode submodules ; (vars/env) BUILDDIR SRCDIR set -e if test ! -d ../gnu; then @@ -14,14 +14,12 @@ if test ! -d ../gnulib; then exit 1 fi - pushd "$PWD" make PROFILE=release BUILDDIR="$PWD/target/release/" cp "${BUILDDIR}/install" "${BUILDDIR}/ginstall" # The GNU tests rename this script before running, to avoid confusion with the make target # Create *sum binaries -for sum in b2sum b3sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum -do +for sum in b2sum b3sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum; do sum_path="${BUILDDIR}/${sum}" test -f "${sum_path}" || cp "${BUILDDIR}/hashsum" "${sum_path}" done @@ -31,10 +29,12 @@ GNULIB_SRCDIR="$PWD/../gnulib" pushd ../gnu/ # Any binaries that aren't built become `false` so their tests fail -for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs) -do +for binary in $(./build-aux/gen-lists-of-programs.sh --list-progs); do bin_path="${BUILDDIR}/${binary}" - test -f "${bin_path}" || { echo "'${binary}' was not built with uutils, using the 'false' program"; cp "${BUILDDIR}/false" "${bin_path}"; } + test -f "${bin_path}" || { + echo "'${binary}' was not built with uutils, using the 'false' program" + cp "${BUILDDIR}/false" "${bin_path}" + } done ./bootstrap --gnulib-srcdir="$GNULIB_SRCDIR" @@ -47,18 +47,15 @@ sed -i 's| tr | /usr/bin/tr |' tests/init.sh make -j "$(nproc)" # Generate the factor tests, so they can be fixed # Used to be 36. Reduced to 20 to decrease the log size -for i in {00..20} -do +for i in {00..20}; do make "tests/factor/t${i}.sh" done # strip the long stuff -for i in {21..36} -do +for i in {21..36}; do sed -i -e "s/\$(tf)\/t${i}.sh//g" Makefile done - grep -rl 'path_prepend_' tests/* | xargs sed -i 's| path_prepend_ ./src||' sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*sh @@ -97,11 +94,9 @@ sed -i 's|seq |/usr/bin/seq |' tests/misc/sort-discrim.sh # Add specific timeout to tests that currently hang to limit time spent waiting sed -i 's|\(^\s*\)seq \$|\1/usr/bin/timeout 0.1 seq \$|' tests/misc/seq-precision.sh tests/misc/seq-long-double.sh - # Remove dup of /usr/bin/ when executed several times grep -rlE '/usr/bin/\s?/usr/bin' init.cfg tests/* | xargs --no-run-if-empty sed -Ei 's|/usr/bin/\s?/usr/bin/|/usr/bin/|g' - #### Adjust tests to make them work with Rust/coreutils # in some cases, what we are doing in rust/coreutils is good (or better) # we should not regress our project just to match what GNU is going. diff --git a/util/run-gnu-test.sh b/util/run-gnu-test.sh index 123c4dab2..1900bb523 100755 --- a/util/run-gnu-test.sh +++ b/util/run-gnu-test.sh @@ -1,7 +1,7 @@ #!/bin/bash # `$0 [TEST]` # run GNU test (or all tests if TEST is missing/null) -# spell-checker:ignore (env/vars) BUILDDIR GNULIB SUBDIRS +# spell-checker:ignore (env/vars) GNULIB SUBDIRS ; (utils) shellcheck ME_dir="$(dirname -- "$(readlink -fm -- "$0")")" REPO_main_dir="$(dirname -- "${ME_dir}")" diff --git a/util/show-code_coverage.sh b/util/show-code_coverage.sh index 2701d6466..4be056ccc 100755 --- a/util/show-code_coverage.sh +++ b/util/show-code_coverage.sh @@ -1,6 +1,6 @@ #!/bin/sh -# spell-checker:ignore (vars) OSID +# spell-checker:ignore (vars) OSID binfmt ME_dir="$(dirname -- "$(readlink -fm -- "$0")")" REPO_main_dir="$(dirname -- "${ME_dir}")"