From 80d5d53f301e7a3c831418368b2ee1a6c20c3ce8 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 6 Jan 2013 14:43:11 -0600 Subject: [PATCH] Don't assume that the tester's $top_dir will sort (via ls -a) before tmp/. Thanks to Alexander Barton for reporting the problem. Signed-off-by: Rob Browning Tested-by: Alexander Barton --- t/test.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/t/test.sh b/t/test.sh index b56a06c..900a413 100755 --- 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 -- 2.39.2