summaryrefslogtreecommitdiff
path: root/tests/misc/printenv
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/misc/printenv
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/misc/printenv')
-rwxr-xr-xtests/misc/printenv10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/misc/printenv b/tests/misc/printenv
index 607914c10..a13a139c9 100755
--- a/tests/misc/printenv
+++ b/tests/misc/printenv
@@ -23,7 +23,7 @@ print_ver_ printenv
# printenv as a builtin, so we must invoke it via "env".
# But beware of $_, set by many shells to the last command run.
# Also, filter out LD_PRELOAD, which is set when running under valgrind.
-env | grep -Ev '^(_|LD_PRELOAD=)' > exp || framework_failure
+env | grep -Ev '^(_|LD_PRELOAD=)' > exp || framework_failure_
env -- printenv | grep -Ev '^(_|LD_PRELOAD=)' > out || fail=1
compare exp out || fail=1
@@ -38,7 +38,7 @@ fi
env -- printenv ENV_TEST > out
test $? = 1 || fail=1
test -s out && fail=1
-echo a > exp || framework_failure
+echo a > exp || framework_failure_
ENV_TEST=a env -- printenv ENV_TEST > out || fail=1
compare exp out || fail=1
@@ -46,7 +46,7 @@ compare exp out || fail=1
ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST2 ENV_TEST1 ENV_TEST2 > out \
|| fail=1
ENV_TEST1=a ENV_TEST2=b env -- printenv ENV_TEST1 ENV_TEST2 >> out || fail=1
-cat <<EOF > exp || framework_failure
+cat <<EOF > exp || framework_failure_
b
a
b
@@ -60,7 +60,7 @@ ENV_TEST1=a env -- printenv ENV_TEST2 ENV_TEST1 > out
test $? = 1 || fail=1
ENV_TEST1=a env -- printenv ENV_TEST1 ENV_TEST2 >> out
test $? = 1 || fail=1
-cat <<EOF > exp || framework_failure
+cat <<EOF > exp || framework_failure_
a
a
EOF
@@ -68,7 +68,7 @@ compare exp out || fail=1
# Non-standard environment variable name. Shells won't create it, but
# env can, and printenv must be able to deal with it.
-echo b > exp || framework_failure
+echo b > exp || framework_failure_
env -- -a=b printenv -- -a > out || fail=1
compare exp out || fail=1