summaryrefslogtreecommitdiff
path: root/tests/ls/color-norm
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-04 20:52:31 +0200
committerJim Meyering <meyering@redhat.com>2011-08-08 10:11:48 +0200
commit554caaf6ffc721fe83debe0eb5e555136b01f0bb (patch)
tree3434c8a4fca2cdac2ec5fca8bd808bd17a6f4d30 /tests/ls/color-norm
parent8e2767a3f0c279d355f067e53be2c63173959eb1 (diff)
downloadcoreutils-554caaf6ffc721fe83debe0eb5e555136b01f0bb.tar.xz
tests: complete the renaming framework_failure -> framework_failure_
These changes were mostly mechanical, made by running the following command: git grep -lw framework_failure | grep -v ChangeLog \ | xargs perl -pi -e 's/\b(framework_failure)\b/${1}_/' and then editing init.cfg and `tests/cp/cp-a-selinux' by hand. * tests/init.cfg (framework_failure): Remove, `framework_failure_' from init.sh should be used instead in the tests. Remove now-obsolete "FIXME" comment. (is_local_dir_, require_strace_, require_membership_in_two_groups_, require_sparse_support_, skip_if_mcstransd_is_running_, mkfifo_or_skip_) Use `framework_failure_', not `framework_failure'. * Many test scripts: Likewise.
Diffstat (limited to 'tests/ls/color-norm')
-rwxr-xr-xtests/ls/color-norm12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ls/color-norm b/tests/ls/color-norm
index 20bc1217f..c8691034b 100755
--- a/tests/ls/color-norm
+++ b/tests/ls/color-norm
@@ -30,9 +30,9 @@ export TIME_STYLE="+norm"
# helper to strip ls columns up to "norm" time
qls() { sed 's/-r.*norm/norm/'; }
-touch exe || framework_failure
-chmod u+x exe || framework_failure
-touch nocolor || framework_failure
+touch exe || framework_failure_
+chmod u+x exe || framework_failure_
+touch nocolor || framework_failure_
TCOLORS="no=7:ex=01;32"
@@ -58,10 +58,10 @@ LS_COLORS=$TCOLORS ls -mFU --color nocolor exe >> out || fail=1
# Ensure no coloring is done unless enabled
LS_COLORS=$TCOLORS ls -gGU nocolor exe | qls >> out || fail=1
-cat -A out > out.display || framework_failure
-mv out.display out || framework_failure
+cat -A out > out.display || framework_failure_
+mv out.display out || framework_failure_
-cat <<\EOF > exp || framework_failure
+cat <<\EOF > exp || framework_failure_
^[[0m^[[7mnorm ^[[m^[[01;32mexe^[[0m$
^[[7mnorm nocolor^[[0m$
^[[0m^[[7m^[[m^[[01;32mexe^[[0m ^[[7mnocolor^[[0m$