Don't assume that the tester's $top_dir will sort (via ls -a) before tmp/.

Thanks to Alexander Barton <alex@barton.de> for reporting the problem.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Alexander Barton <alex@barton.de>

diff --git a/t/test.sh b/t/test.sh
index b56a06c1c77551ac40a38e99783fc541384a76ed..900a4134baf3a056c4787c35fa1aa6a52e9bbc0c 100755 (executable)
--- a/t/test.sh
+++ b/t/test.sh
@@ -511,7 +511,6 @@ WVSTART "save disjoint top-level directories"
     WVPASS bup init
     WVPASS bup index -vu $(pwd)/$D/x "$tmpdir"
     WVPASS bup save -t -n src $(pwd)/$D/x "$tmpdir"
-    WVPASSEQ "$(bup ls -a src/latest)" \
-"$top_dir/
-tmp/"
+    # For now, assume that "ls -a" and "sort" use the same order.
+    WVPASSEQ "$(bup ls -a src/latest)" "$(echo -e "$top_dir/\ntmp/" | sort)"
 ) || WVFAIL