diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-01-10 21:12:38 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-01-10 21:18:33 +0000 |
| commit | eef0cd62dd63c12e28b1c7779fb149a8a30f8fe7 (patch) | |
| tree | 789e43749002627c935449f8b60584ad1a78367a /tests/cp | |
| parent | fb13cdc727541adef0010279f770f2afa358002e (diff) | |
| download | coreutils-eef0cd62dd63c12e28b1c7779fb149a8a30f8fe7.tar.xz | |
maint: clean up some test issues identified with shellcheck
* 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.
Diffstat (limited to 'tests/cp')
| -rwxr-xr-x | tests/cp/cp-a-selinux.sh | 6 | ||||
| -rwxr-xr-x | tests/cp/fiemap-perf.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/cp/cp-a-selinux.sh b/tests/cp/cp-a-selinux.sh index 1426582e0..2ecbd2386 100755 --- a/tests/cp/cp-a-selinux.sh +++ b/tests/cp/cp-a-selinux.sh @@ -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 diff --git a/tests/cp/fiemap-perf.sh b/tests/cp/fiemap-perf.sh index 0f18b45b0..5517ad0cc 100755 --- a/tests/cp/fiemap-perf.sh +++ b/tests/cp/fiemap-perf.sh @@ -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' |