From efad1c9e4e3dadfe3a65f8a869657c56c71dcf44 Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Sun, 19 Jan 2020 00:49:23 +0000 Subject: [PATCH] Fix integration test suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fix script problem with shell operator precedence with Git repo symlinks • Fix test failure with --long --help --- xtests/help_long | 4 ++++ xtests/run.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xtests/help_long b/xtests/help_long index 24e61b7..8a775f0 100644 --- a/xtests/help_long +++ b/xtests/help_long @@ -14,5 +14,9 @@ LONG VIEW OPTIONS -u, --accessed use the accessed timestamp field -U, --created use the created timestamp field --time-style how to format timestamps (default, iso, long-iso, full-iso) + --no-permissions suppress the permissions field + --no-filesize suppress the filesize field + --no-user suppress the user field + --no-time suppress the time field --git list each file's Git status, if tracked or ignored -@, --extended list each file's extended attributes and sizes diff --git a/xtests/run.sh b/xtests/run.sh index e988f78..516c770 100755 --- a/xtests/run.sh +++ b/xtests/run.sh @@ -211,7 +211,7 @@ $exa $testcases/git2/deeply/nested/repository -l --git 2>&1 | diff -q - $results $exa $testcases/git2/{deeply,ignoreds,target} -l --git 2>&1 | diff -q - $results/git_2_all || exit 1 # Regressions test -$exa $testcases/git3 -l --git &>/dev/null || echo "Failed to display broken symlink in git repository"; exit 1 +$exa $testcases/git3 -l --git &>/dev/null || exit 1 COLUMNS=150 $exa $testcases/git/**/* $testcases --git --long --grid -d | diff -q - $results/git_1_files || exit 1