Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-07 10:49:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5090 from starccy/fix-shell-script-style

Browse source 
"style(util): fix/format scripts to meet the `shellcheck`/`shfmt` rules"
This commit is contained in:
Sylvestre Ledru 2023-07-17 09:13:30 +02:00 committed by GitHub
commit e3f8f2ab25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
util/analyze-gnu-results.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# spell-checker:ignore xpass XPASS testsuite # spell-checker:ignore xpass XPASS testsuite
set -e set -e
@ -67,9 +67,13 @@ function get_error {
echo $((NON_ROOT + AS_ROOT)) echo $((NON_ROOT + AS_ROOT))
} }
export TOTAL=$(get_total) # we don't need the return codes indeed, ignore them
export PASS=$(get_pass) # shellcheck disable=SC2155
export SKIP=$(get_skip) {
export FAIL=$(get_fail) export TOTAL=$(get_total)
export XPASS=$(get_xpass) export PASS=$(get_pass)
export ERROR=$(get_error) export SKIP=$(get_skip)
export FAIL=$(get_fail)
export XPASS=$(get_xpass)
export ERROR=$(get_error)
}

1
util/build-gnu.sh
View file

@ -215,7 +215,6 @@ sed -i -e "s/provoked error./provoked error\ncat pat |sort -u > pat/" tests/misc
# Update the GNU error message to match ours # Update the GNU error message to match ours
sed -i -e "s/link-to-dir: hard link not allowed for directory/failed to create hard link 'link-to-dir' =>/" -e "s|link-to-dir/: hard link not allowed for directory|failed to create hard link 'link-to-dir/' =>|" tests/ln/hard-to-sym.sh sed -i -e "s/link-to-dir: hard link not allowed for directory/failed to create hard link 'link-to-dir' =>/" -e "s|link-to-dir/: hard link not allowed for directory|failed to create hard link 'link-to-dir/' =>|" tests/ln/hard-to-sym.sh
# GNU sleep accepts some crazy string, not sure we should match this behavior # GNU sleep accepts some crazy string, not sure we should match this behavior
sed -i -e "s/timeout 10 sleep 0x.002p1/#timeout 10 sleep 0x.002p1/" tests/misc/sleep.sh sed -i -e "s/timeout 10 sleep 0x.002p1/#timeout 10 sleep 0x.002p1/" tests/misc/sleep.sh

6
util/run-gnu-test.sh
View file

@ -36,7 +36,7 @@ if test $# -ge 1; then
SPECIFIC_TESTS="$SPECIFIC_TESTS $t" SPECIFIC_TESTS="$SPECIFIC_TESTS $t"
done done
# trim it # trim it
SPECIFIC_TESTS=$(echo $SPECIFIC_TESTS| xargs) SPECIFIC_TESTS=$(echo $SPECIFIC_TESTS | xargs)
echo "Running specific tests: $SPECIFIC_TESTS" echo "Running specific tests: $SPECIFIC_TESTS"
fi fi
@ -46,14 +46,14 @@ fi
#shellcheck disable=SC2086 #shellcheck disable=SC2086
if test "$1" != "run-root"; then if test "$1" != "run-root"; then
# run the regular tests # run the regular tests
if test $# -ge 1; then if test $# -ge 1; then
timeout -sKILL 4h make -j "$(nproc)" check TESTS="$SPECIFIC_TESTS" SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" || : # Kill after 4 hours in case something gets stuck in make timeout -sKILL 4h make -j "$(nproc)" check TESTS="$SPECIFIC_TESTS" SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" || : # Kill after 4 hours in case something gets stuck in make
else else
timeout -sKILL 4h make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" || : # Kill after 4 hours in case something gets stuck in make timeout -sKILL 4h make -j "$(nproc)" check SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" || : # Kill after 4 hours in case something gets stuck in make
fi fi
else else
# in case we would like to run tests requiring root # in case we would like to run tests requiring root
if test -z "$1" -o "$1" == "run-root"; then if test -z "$1" -o "$1" == "run-root"; then
if test -n "$CI"; then if test -n "$CI"; then
echo "Running check-root to run only root tests" echo "Running check-root to run only root tests"

1
util/update-version.sh
View file

@ -47,4 +47,3 @@ sed -i -e "s|uucore = { version=\">=$FROM\",|uucore = { version=\">=$TO\",|" $PR
# Update crates using uucore_procs # Update crates using uucore_procs
#shellcheck disable=SC2086 #shellcheck disable=SC2086
sed -i -e "s|uucore_procs = { version=\">=$FROM\",|uucore_procs = { version=\">=$TO\",|" $PROGS sed -i -e "s|uucore_procs = { version=\">=$FROM\",|uucore_procs = { version=\">=$TO\",|" $PROGS