From 2e580ca741b83202e6b22e0bb58b18101a443bd8 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 14 Jun 2011 16:22:41 +0200 Subject: tests: remove skip_test_ function; use new skip_ instead * tests/init.cfg (skip_test_): Remove function. Use skip_ in place of skip_test_ everywhere else. * cfg.mk (sc_prohibit_skip_): Remove rule. * tests/**: Use skip_, not skip_test_, everywhere. --- tests/misc/xattr | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tests/misc/xattr') diff --git a/tests/misc/xattr b/tests/misc/xattr index 60fc24c6c..05437d037 100755 --- a/tests/misc/xattr +++ b/tests/misc/xattr @@ -24,7 +24,7 @@ print_ver_ cp mv ginstall # Skip this test if cp was built without xattr support: touch src dest || framework_failure cp --preserve=xattr -n src dest \ - || skip_test_ "coreutils built without xattr support" + || skip_ "coreutils built without xattr support" # this code was taken from test mv/backup-is-src cleanup_() { rm -rf "$other_partition_tmpdir"; } @@ -39,42 +39,42 @@ xattr_pair="$xattr_name=\"$xattr_value\"" # create new file and check its xattrs touch a || framework_failure -getfattr -d a >out_a || skip_test_ "failed to get xattr of file" +getfattr -d a >out_a || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_a && framework_failure # try to set user xattr on file setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \ - || skip_test_ "failed to set xattr of file" -getfattr -d a >out_a || skip_test_ "failed to get xattr of file" + || skip_ "failed to set xattr of file" +getfattr -d a >out_a || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_a \ - || skip_test_ "failed to set xattr of file" + || skip_ "failed to set xattr of file" # cp should not preserve xattr by default cp a b || fail=1 -getfattr -d b >out_b || skip_test_ "failed to get xattr of file" +getfattr -d b >out_b || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_b && fail=1 # test if --preserve=xattr option works cp --preserve=xattr a b || fail=1 -getfattr -d b >out_b || skip_test_ "failed to get xattr of file" +getfattr -d b >out_b || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_b || fail=1 # test if --preserve=all option works cp --preserve=all a c || fail=1 -getfattr -d c >out_c || skip_test_ "failed to get xattr of file" +getfattr -d c >out_c || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_c || fail=1 # cp's -a option must produce no diagnostics. cp -a a d 2>err && test -s err && fail=1 -getfattr -d d >out_d || skip_test_ "failed to get xattr of file" +getfattr -d d >out_d || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_d || fail=1 # test if --preserve=xattr works even for files without write access chmod a-w a || framework_failure rm -f e cp --preserve=xattr a e || fail=1 -getfattr -d e >out_e || skip_test_ "failed to get xattr of file" +getfattr -d e >out_e || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_e || fail=1 # Ensure that permission bits are preserved, too. @@ -88,14 +88,14 @@ rm b || framework_failure # install should never preserve xattr ginstall a b || fail=1 -getfattr -d b >out_b || skip_test_ "failed to get xattr of file" +getfattr -d b >out_b || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_b && fail=1 # mv should preserve xattr when renaming within a file system. # This is implicitly done by rename () and doesn't need explicit # xattr support in mv. mv a b || fail=1 -getfattr -d b >out_b || skip_test_ "failed to get xattr of file" +getfattr -d b >out_b || skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_b || cat >&2 <out_b || - skip_test_ "failed to get xattr of file" + skip_ "failed to get xattr of file" grep -F "$xattr_pair" out_b || fail=1 else cat >&2 <