diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-04-18 11:19:10 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-04-18 11:23:37 +0100 |
| commit | 14613e2fd132a1e252849cd881706bca8428f9f9 (patch) | |
| tree | f4942a5ae28a8d7f74ecae6b09b605c288a4e0f8 | |
| parent | f6bcfef3d20c593bb4108d4b34c6873081930e00 (diff) | |
| download | coreutils-14613e2fd132a1e252849cd881706bca8428f9f9.tar.xz | |
tests: make ls tests independent of COLORTERM env
Since the recent commit v8.22-68-g08783f1, ls coloring
is now dependent on the COLORTERM environment variable.
* tests/envvar-check: Unset COLORTERM from test environment.
* tests/ls/color-dtype-dir.sh: Ensure coloring is used.
* tests/misc/ls-misc.pl: Likewise.
Prompted by the continuous integration build failure at:
http://hydra.nixos.org/build/10397646
| -rw-r--r-- | tests/envvar-check | 1 | ||||
| -rwxr-xr-x | tests/ls/color-dtype-dir.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/ls-misc.pl | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/envvar-check b/tests/envvar-check index 09b4ded5f..b6d94b4cb 100644 --- a/tests/envvar-check +++ b/tests/envvar-check @@ -43,6 +43,7 @@ vars=' SIMPLE_BACKUP_SUFFIX TABSIZE TERM + COLORTERM TIME_STYLE TMPDIR VERSION_CONTROL diff --git a/tests/ls/color-dtype-dir.sh b/tests/ls/color-dtype-dir.sh index 88dd781ff..559a18849 100755 --- a/tests/ls/color-dtype-dir.sh +++ b/tests/ls/color-dtype-dir.sh @@ -30,7 +30,7 @@ chmod o+w other-writable || framework_failure_ chmod o+t sticky || framework_failure_ -ls --color=always > out || fail=1 +TERM=xterm ls --color=always > out || fail=1 cat -A out > o1 || fail=1 mv o1 out || fail=1 diff --git a/tests/misc/ls-misc.pl b/tests/misc/ls-misc.pl index f562b72e6..a47e70b7a 100755 --- a/tests/misc/ls-misc.pl +++ b/tests/misc/ls-misc.pl @@ -303,9 +303,12 @@ my @Tests = . "\e[37;44msticky$e\n" }, + {PRE => sub { + push_ls_colors('ow=34;42:tw=30;42:sg=30;43:su=37;41:st=37;44'); }}, {POST => sub { unlink qw(setuid setgid); - foreach my $dir (qw(owr owt sticky)) {rmdir $dir} }}, + foreach my $dir (qw(owr owt sticky)) {rmdir $dir} + restore_ls_colors; }}, ], # For 5.97 and earlier, --file-type acted like --indicator-style=slash. |