diff options
| -rwxr-xr-x | tests/cp/cp-a-selinux.sh | 6 | ||||
| -rwxr-xr-x | tests/cp/fiemap-perf.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/printf-surprise.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/shuf.sh | 2 |
4 files changed, 6 insertions, 6 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' diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh index d8d967d85..0af64482d 100755 --- a/tests/misc/printf-surprise.sh +++ b/tests/misc/printf-surprise.sh @@ -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. diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh index 34f422507..c7db14f60 100755 --- a/tests/misc/shuf.sh +++ b/tests/misc/shuf.sh @@ -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 ; } |