CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-17 21:02:25 +02:00
Code Issues Projects Releases Wiki Activity

maint: clean up some test issues identified with shellcheck

Browse Source 
* tests/cp/cp-a-selinux.sh: Comment why unused variables are assigned.
Fix misspellings noticed while adjusting.
* tests/cp/fiemap-perf.sh: Fix quoting.
* tests/misc/shuf.sh: Avoid useless use of cat.
* tests/misc/printf-surprise.sh: Likewise.
This commit is contained in:
Pádraig Brady
2015-01-10 21:12:38 +00:00
parent fb13cdc727
commit eef0cd62dd
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cp/cp-a-selinux.sh
View File

@@ -64,7 +64,7 @@ get_selinux_type() { ls -Zd "$1" | sed -n 's/.*:\(.*_t\):.*/\1/p'; }
# Also make a dir with our known context
mkdir c_d || framework_failure_
chcon $ctx c_d || framework_failure_
# Get the type of this known context for file and dir
# Get the type of this known context for file and dir for tracing
old_type_f=$(get_selinux_type c)
old_type_d=$(get_selinux_type c_d)
# Setup copies for manipulation with restorecon
@@ -80,7 +80,7 @@ if restorecon Z1 Z1_d 2>/dev/null; then
cpZ_type_f=$(get_selinux_type Z2)
test "$cpZ_type_f" = "$new_type_f" || fail=1
# Ensuze -Z overrides -a and that dirs are handled too
# Ensure -Z overrides -a and that dirs are handled too
cp -aZ c Z3 || fail=1
cp -aZ c_d Z3_d || fail=1
cpaZ_type_f=$(get_selinux_type Z3)
@@ -197,7 +197,7 @@ for no_g_cmd in '' 'rm -f g'; do
cp -a --context="$ctx" ../f g || fail=1
done
# Mutually exlusive options
# Mutually exclusive options
cp -Z --preserve=context ../f g && fail=1
cp --preserve=context -Z ../f g && fail=1
cp --preserve=context --context="$ctx" ../f g && fail=1

2
tests/cp/fiemap-perf.sh
View File

@@ -35,7 +35,7 @@ timeout 10 truncate -s1T f ||
# Disable this test on old BTRFS (e.g. Fedora 14)
# which reports (unwritten) extents for holes.
filefrag f || skip_ 'the 'filefrag' utility is missing'
filefrag f || skip_ "the 'filefrag' utility is missing"
filefrag f | grep -F ': 0 extents found' > /dev/null ||
skip_ 'this file system reports extents for holes'

2
tests/misc/printf-surprise.sh
View File

@@ -63,7 +63,7 @@ exit=$?
# Map this longer, and rarer, diagnostic to the common one.
# printf: cannot perform formatted output: Cannot allocate memory" \
sed 's/cannot perform .*/write error/' err-msg > k && mv k err-msg
err_msg=$(cat err-msg|tr '\n' :)
err_msg=$(tr '\n' : < err-msg)
# By some bug, on Solaris 11 (5.11 snv_86), err_msg ends up
# containing '1> fifo:printf: write error:'. Recognize that, too.

2
tests/misc/shuf.sh
View File

@@ -125,7 +125,7 @@ test "$c" = "0 1 2 3 4 5 6 7 8 9" ||
# check --repeat with non-zero low value
shuf --rep -i222-233 -n2000 > exp || framework_failure_
c=$(cat exp | sort -nu | paste -s -d ' ') || framework_failure_
c=$(sort -nu exp | paste -s -d ' ') || framework_failure_
test "$c" = "222 223 224 225 226 227 228 229 230 231 232 233" ||
{ fail=1; echo "--repeat produced bad output with non-zero low">&2 ; }