mirror of
https://github.com/uutils/coreutils
synced 2024-11-15 01:17:09 +00:00
"style: fix/format scripts to meet the shellcheck
/shfmt
rules"
This commit is contained in:
parent
1b4ef90e25
commit
b6ec498e0e
4 changed files with 14 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
# spell-checker:ignore xpass XPASS testsuite
|
||||
set -e
|
||||
|
||||
|
@ -67,9 +67,13 @@ function get_error {
|
|||
echo $((NON_ROOT + AS_ROOT))
|
||||
}
|
||||
|
||||
export TOTAL=$(get_total)
|
||||
export PASS=$(get_pass)
|
||||
export SKIP=$(get_skip)
|
||||
export FAIL=$(get_fail)
|
||||
export XPASS=$(get_xpass)
|
||||
export ERROR=$(get_error)
|
||||
# we don't need the return codes indeed, ignore them
|
||||
# shellcheck disable=SC2155
|
||||
{
|
||||
export TOTAL=$(get_total)
|
||||
export PASS=$(get_pass)
|
||||
export SKIP=$(get_skip)
|
||||
export FAIL=$(get_fail)
|
||||
export XPASS=$(get_xpass)
|
||||
export ERROR=$(get_error)
|
||||
}
|
||||
|
|
|
@ -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
|
||||
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
|
||||
sed -i -e "s/timeout 10 sleep 0x.002p1/#timeout 10 sleep 0x.002p1/" tests/misc/sleep.sh
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ if test $# -ge 1; then
|
|||
SPECIFIC_TESTS="$SPECIFIC_TESTS $t"
|
||||
done
|
||||
# trim it
|
||||
SPECIFIC_TESTS=$(echo $SPECIFIC_TESTS| xargs)
|
||||
SPECIFIC_TESTS=$(echo $SPECIFIC_TESTS | xargs)
|
||||
echo "Running specific tests: $SPECIFIC_TESTS"
|
||||
fi
|
||||
|
||||
|
@ -46,14 +46,14 @@ fi
|
|||
#shellcheck disable=SC2086
|
||||
|
||||
if test "$1" != "run-root"; then
|
||||
# run the regular tests
|
||||
# run the regular tests
|
||||
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
|
||||
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
|
||||
fi
|
||||
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 -n "$CI"; then
|
||||
echo "Running check-root to run only root tests"
|
||||
|
|
|
@ -47,4 +47,3 @@ sed -i -e "s|uucore = { version=\">=$FROM\",|uucore = { version=\">=$TO\",|" $PR
|
|||
# Update crates using uucore_procs
|
||||
#shellcheck disable=SC2086
|
||||
sed -i -e "s|uucore_procs = { version=\">=$FROM\",|uucore_procs = { version=\">=$TO\",|" $PROGS
|
||||
|
||||
|
|
Loading…
Reference in a new issue