From 3247de3cbb1c7c4a205604d08a26b5a6c60db246 Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Mon, 5 Aug 2019 22:47:52 +0200 Subject: [PATCH] Fix vagrant integration tests * For dates need the LC_ALL env * Missing new option --icons on help output --- xtests/help | 1 + xtests/run.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xtests/help b/xtests/help index 504a89f..f316431 100644 --- a/xtests/help +++ b/xtests/help @@ -14,6 +14,7 @@ DISPLAY OPTIONS -F, --classify display type indicator by file names --colo[u]r=WHEN when to use terminal colours (always, auto, never) --colo[u]r-scale highlight levels of file sizes distinctly + --icons display icons FILTERING AND SORTING OPTIONS -a, --all show hidden and 'dot' files diff --git a/xtests/run.sh b/xtests/run.sh index 577b4b2..2f390d6 100755 --- a/xtests/run.sh +++ b/xtests/run.sh @@ -153,8 +153,8 @@ $exa $testcases/dates -l --time-style=iso 2>&1 | diff -q - $results/d # Locales # These two are used in particular because they have 5-long and 4-long # month names respectively -env LANG=fr_FR.UTF-8 $exa $testcases/dates -l | diff -q - $results/dates_fr || exit 1 -env LANG=ja_JP.UTF-8 $exa $testcases/dates -l | diff -q - $results/dates_jp || exit 1 +env LC_ALL=fr_FR.UTF-8 LANG=fr_FR.UTF-8 $exa $testcases/dates -l | diff -q - $results/dates_fr || exit 1 +env LC_ALL=ja_JP.UTF-8 LANG=ja_JP.UTF-8 $exa $testcases/dates -l | diff -q - $results/dates_jp || exit 1 # Paths and directories