From da171c405f926ef06288cd69a3408178401e2e3d Mon Sep 17 00:00:00 2001
From: Benjamin Sago <ogham@bsago.me>
Date: Mon, 29 Mar 2021 23:02:35 +0100
Subject: [PATCH] Fix argument sorting in test outputs

See GH-756.
---
 xtests/grid-view.toml                        |  3 +--
 xtests/outputs/files_paths_grid_3col.ansitxt | 26 ++++++++++----------
 xtests/outputs/files_paths_grid_5col.ansitxt | 16 ++++++------
 xtests/outputs/files_paths_grid_7col.ansitxt | 12 ++++-----
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/xtests/grid-view.toml b/xtests/grid-view.toml
index 978c5a9..05986b1 100644
--- a/xtests/grid-view.toml
+++ b/xtests/grid-view.toml
@@ -102,8 +102,7 @@ tags = [ 'env', 'grid' ]
 
 
 # columns and width tests with files
-# (these rely on bash’s glob sort order)
-# (some of the output files also have trailing whitespace)
+# (warning: some of the output files have trailing whitespace)
 
 [[cmd]]
 name = "‘COLUMNS=100 exa’ with file arguments produces a grid of 3 columns, with full paths"
diff --git a/xtests/outputs/files_paths_grid_3col.ansitxt b/xtests/outputs/files_paths_grid_3col.ansitxt
index 5523127..5990274 100644
--- a/xtests/outputs/files_paths_grid_3col.ansitxt
+++ b/xtests/outputs/files_paths_grid_3col.ansitxt
@@ -1,13 +1,13 @@
-/testcases/files/10_bytes  /testcases/files/1_KiB    /testcases/files/5_MiB
-/testcases/files/10_KiB    /testcases/files/1_MiB    /testcases/files/6_bytes
-/testcases/files/10_MiB    /testcases/files/2_bytes  /testcases/files/6_KiB
-/testcases/files/11_bytes  /testcases/files/2_KiB    /testcases/files/6_MiB
-/testcases/files/11_KiB    /testcases/files/2_MiB    /testcases/files/7_bytes
-/testcases/files/11_MiB    /testcases/files/3_bytes  /testcases/files/7_KiB
-/testcases/files/12_bytes  /testcases/files/3_KiB    /testcases/files/7_MiB
-/testcases/files/12_KiB    /testcases/files/3_MiB    /testcases/files/8_bytes
-/testcases/files/12_MiB    /testcases/files/4_bytes  /testcases/files/8_KiB
-/testcases/files/13_bytes  /testcases/files/4_KiB    /testcases/files/8_MiB
-/testcases/files/13_KiB    /testcases/files/4_MiB    /testcases/files/9_bytes
-/testcases/files/13_MiB    /testcases/files/5_bytes  /testcases/files/9_KiB
-/testcases/files/1_bytes   /testcases/files/5_KiB    /testcases/files/9_MiB
+/testcases/files/1_bytes  /testcases/files/5_KiB    /testcases/files/9_MiB
+/testcases/files/1_KiB    /testcases/files/5_MiB    /testcases/files/10_bytes
+/testcases/files/1_MiB    /testcases/files/6_bytes  /testcases/files/10_KiB
+/testcases/files/2_bytes  /testcases/files/6_KiB    /testcases/files/10_MiB
+/testcases/files/2_KiB    /testcases/files/6_MiB    /testcases/files/11_bytes
+/testcases/files/2_MiB    /testcases/files/7_bytes  /testcases/files/11_KiB
+/testcases/files/3_bytes  /testcases/files/7_KiB    /testcases/files/11_MiB
+/testcases/files/3_KiB    /testcases/files/7_MiB    /testcases/files/12_bytes
+/testcases/files/3_MiB    /testcases/files/8_bytes  /testcases/files/12_KiB
+/testcases/files/4_bytes  /testcases/files/8_KiB    /testcases/files/12_MiB
+/testcases/files/4_KiB    /testcases/files/8_MiB    /testcases/files/13_bytes
+/testcases/files/4_MiB    /testcases/files/9_bytes  /testcases/files/13_KiB
+/testcases/files/5_bytes  /testcases/files/9_KiB    /testcases/files/13_MiB
diff --git a/xtests/outputs/files_paths_grid_5col.ansitxt b/xtests/outputs/files_paths_grid_5col.ansitxt
index eac4bde..a71bc94 100644
--- a/xtests/outputs/files_paths_grid_5col.ansitxt
+++ b/xtests/outputs/files_paths_grid_5col.ansitxt
@@ -1,8 +1,8 @@
-/testcases/files/10_bytes  /testcases/files/12_MiB    /testcases/files/2_KiB    /testcases/files/5_bytes  /testcases/files/7_MiB
-/testcases/files/10_KiB    /testcases/files/13_bytes  /testcases/files/2_MiB    /testcases/files/5_KiB    /testcases/files/8_bytes
-/testcases/files/10_MiB    /testcases/files/13_KiB    /testcases/files/3_bytes  /testcases/files/5_MiB    /testcases/files/8_KiB
-/testcases/files/11_bytes  /testcases/files/13_MiB    /testcases/files/3_KiB    /testcases/files/6_bytes  /testcases/files/8_MiB
-/testcases/files/11_KiB    /testcases/files/1_bytes   /testcases/files/3_MiB    /testcases/files/6_KiB    /testcases/files/9_bytes
-/testcases/files/11_MiB    /testcases/files/1_KiB     /testcases/files/4_bytes  /testcases/files/6_MiB    /testcases/files/9_KiB
-/testcases/files/12_bytes  /testcases/files/1_MiB     /testcases/files/4_KiB    /testcases/files/7_bytes  /testcases/files/9_MiB
-/testcases/files/12_KiB    /testcases/files/2_bytes   /testcases/files/4_MiB    /testcases/files/7_KiB    
+/testcases/files/1_bytes  /testcases/files/3_MiB    /testcases/files/6_KiB    /testcases/files/9_bytes   /testcases/files/11_MiB
+/testcases/files/1_KiB    /testcases/files/4_bytes  /testcases/files/6_MiB    /testcases/files/9_KiB     /testcases/files/12_bytes
+/testcases/files/1_MiB    /testcases/files/4_KiB    /testcases/files/7_bytes  /testcases/files/9_MiB     /testcases/files/12_KiB
+/testcases/files/2_bytes  /testcases/files/4_MiB    /testcases/files/7_KiB    /testcases/files/10_bytes  /testcases/files/12_MiB
+/testcases/files/2_KiB    /testcases/files/5_bytes  /testcases/files/7_MiB    /testcases/files/10_KiB    /testcases/files/13_bytes
+/testcases/files/2_MiB    /testcases/files/5_KiB    /testcases/files/8_bytes  /testcases/files/10_MiB    /testcases/files/13_KiB
+/testcases/files/3_bytes  /testcases/files/5_MiB    /testcases/files/8_KiB    /testcases/files/11_bytes  /testcases/files/13_MiB
+/testcases/files/3_KiB    /testcases/files/6_bytes  /testcases/files/8_MiB    /testcases/files/11_KiB    
diff --git a/xtests/outputs/files_paths_grid_7col.ansitxt b/xtests/outputs/files_paths_grid_7col.ansitxt
index 7e9264f..1f8fbae 100644
--- a/xtests/outputs/files_paths_grid_7col.ansitxt
+++ b/xtests/outputs/files_paths_grid_7col.ansitxt
@@ -1,6 +1,6 @@
-/testcases/files/10_bytes  /testcases/files/12_bytes  /testcases/files/1_bytes  /testcases/files/3_bytes  /testcases/files/5_bytes  /testcases/files/7_bytes  /testcases/files/9_bytes
-/testcases/files/10_KiB    /testcases/files/12_KiB    /testcases/files/1_KiB    /testcases/files/3_KiB    /testcases/files/5_KiB    /testcases/files/7_KiB    /testcases/files/9_KiB
-/testcases/files/10_MiB    /testcases/files/12_MiB    /testcases/files/1_MiB    /testcases/files/3_MiB    /testcases/files/5_MiB    /testcases/files/7_MiB    /testcases/files/9_MiB
-/testcases/files/11_bytes  /testcases/files/13_bytes  /testcases/files/2_bytes  /testcases/files/4_bytes  /testcases/files/6_bytes  /testcases/files/8_bytes  
-/testcases/files/11_KiB    /testcases/files/13_KiB    /testcases/files/2_KiB    /testcases/files/4_KiB    /testcases/files/6_KiB    /testcases/files/8_KiB    
-/testcases/files/11_MiB    /testcases/files/13_MiB    /testcases/files/2_MiB    /testcases/files/4_MiB    /testcases/files/6_MiB    /testcases/files/8_MiB    
+/testcases/files/1_bytes  /testcases/files/3_bytes  /testcases/files/5_bytes  /testcases/files/7_bytes  /testcases/files/9_bytes   /testcases/files/11_bytes  /testcases/files/13_bytes
+/testcases/files/1_KiB    /testcases/files/3_KiB    /testcases/files/5_KiB    /testcases/files/7_KiB    /testcases/files/9_KiB     /testcases/files/11_KiB    /testcases/files/13_KiB
+/testcases/files/1_MiB    /testcases/files/3_MiB    /testcases/files/5_MiB    /testcases/files/7_MiB    /testcases/files/9_MiB     /testcases/files/11_MiB    /testcases/files/13_MiB
+/testcases/files/2_bytes  /testcases/files/4_bytes  /testcases/files/6_bytes  /testcases/files/8_bytes  /testcases/files/10_bytes  /testcases/files/12_bytes  
+/testcases/files/2_KiB    /testcases/files/4_KiB    /testcases/files/6_KiB    /testcases/files/8_KiB    /testcases/files/10_KiB    /testcases/files/12_KiB    
+/testcases/files/2_MiB    /testcases/files/4_MiB    /testcases/files/6_MiB    /testcases/files/8_MiB    /testcases/files/10_MiB    /testcases/files/12_MiB