test-rm: sort compare-trees output with LC_ALL=C

[bup.git] / t / test-ls.sh

diff --git a/t/test-ls.sh b/t/test-ls.sh
index 15b5ac86046905e5150feca40fed1ba4bac7f621..04297ac05a16e5a914273588ca025a8ec035ee8b 100755 (executable)
--- a/t/test-ls.sh
+++ b/t/test-ls.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-. ./wvtest-bup.sh
+. ./wvtest-bup.sh || exit $?
+. t/lib.sh || exit $?
 
 set -o pipefail
 
@@ -17,26 +18,25 @@ WVPASS bup init
 WVPASS cd "$tmpdir"
 
 WVPASS mkdir src
-WVPASS touch -t 196907202018 src/.dotfile
-WVPASS bup random 1k > src/file
-WVPASS touch -t 196907202018 src/file
-(WVPASS cd src; WVPASS ln -s file symlink) || exit $?
+WVPASS touch src/.dotfile src/executable
 WVPASS mkfifo src/fifo
-WVPASS touch -t 196907202018 src/fifo
 WVPASS "$top"/t/mksock src/socket
-WVPASS touch -t 196907202018 src/socket
-WVPASS touch -t 196907202018 src/executable
+WVPASS bup random 1k > src/file
 WVPASS chmod u+x src/executable
-WVPASS touch -t 196907202018 src/executable
-WVPASS touch -t 196907202018 src
-WVPASS touch -t 196907202018 .
 WVPASS chmod -R u=rwX,g-rwx,o-rwx .
+WVPASS touch -t 200910032348 src/.dotfile src/*
+(WVPASS cd src; WVPASS ln -s file symlink) || exit $?
+WVPASS touch -t 200910032348 src
+WVPASS touch -t 200910032348 .
 WVPASS bup index src
-WVPASS bup save -n src src
+WVPASS bup save -n src -d 242312160 src
+WVPASS bup tag some-tag src
 
 
 WVSTART "ls (short)"
 
+(export BUP_FORCE_TTY=1; WVPASSEQ "$(WVPASS bup ls | tr -d ' ')" src)
+
 WVPASSEQ "$(WVPASS bup ls /)" "src"
 
 WVPASSEQ "$(WVPASS bup ls -A /)" ".commit
@@ -59,6 +59,12 @@ WVPASSEQ "$(WVPASS bup ls -aF /)" "./
 .tag/
 src/"
 
+WVPASSEQ "$(WVPASS bup ls /.tag)" "some-tag"
+
+WVPASSEQ "$(WVPASS bup ls /src)" \
+"1977-09-05-125600
+latest"
+
 WVPASSEQ "$(WVPASS bup ls src/latest/"$tmpdir"/src)" "executable
 fifo
 file
@@ -134,7 +140,7 @@ symlink_date="$(WVPASS echo "$symlink_bup_info" \
     || exit $?
 
 if test "$(uname -s)" != NetBSD; then
-    symlink_size="$(WVPASS python -c "import os
+    symlink_size="$(WVPASS bup-python -c "import os
 print os.lstat('src/symlink').st_size")" || exit $?
 else
     # NetBSD appears to return varying sizes, so for now, just ignore it.
@@ -143,60 +149,60 @@ else
         || exit $?
 fi
 
-uid="$(id -u)" || exit $?
-gid="$(python -c 'import os; print os.stat("src").st_gid')" || exit $?
-user="$(id -un)" || exit $?
-group="$(python -c 'import grp, os;
+uid="$(WVPASS id -u)" || exit $?
+gid="$(WVPASS bup-python -c 'import os; print os.stat("src").st_gid')" || exit $?
+user="$(WVPASS id -un)" || exit $?
+group="$(WVPASS bup-python -c 'import grp, os;
 print grp.getgrgid(os.stat("src").st_gid)[0]')" || exit $?
 
 WVPASSEQ "$(bup ls -l src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rwx------ $user/$group 0 1969-07-20 20:18 executable
-prw------- $user/$group 0 1969-07-20 20:18 fifo
--rw------- $user/$group 1024 1969-07-20 20:18 file
-srwx------ $user/$group 0 1969-07-20 20:18 socket
+"-rwx------ $user/$group 0 2009-10-03 23:48 executable
+prw------- $user/$group 0 2009-10-03 23:48 fifo
+-rw------- $user/$group 1024 2009-10-03 23:48 file
+srwx------ $user/$group 0 2009-10-03 23:48 socket
 $symlink_mode $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -la src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"drwx------ $user/$group 0 1969-07-20 20:18 .
-drwx------ $user/$group 0 1969-07-20 20:18 ..
--rw------- $user/$group 0 1969-07-20 20:18 .dotfile
--rwx------ $user/$group 0 1969-07-20 20:18 executable
-prw------- $user/$group 0 1969-07-20 20:18 fifo
--rw------- $user/$group 1024 1969-07-20 20:18 file
-srwx------ $user/$group 0 1969-07-20 20:18 socket
+"drwx------ $user/$group 0 2009-10-03 23:48 .
+drwx------ $user/$group 0 2009-10-03 23:48 ..
+-rw------- $user/$group 0 2009-10-03 23:48 .dotfile
+-rwx------ $user/$group 0 2009-10-03 23:48 executable
+prw------- $user/$group 0 2009-10-03 23:48 fifo
+-rw------- $user/$group 1024 2009-10-03 23:48 file
+srwx------ $user/$group 0 2009-10-03 23:48 socket
 $symlink_mode $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -lA src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rw------- $user/$group 0 1969-07-20 20:18 .dotfile
--rwx------ $user/$group 0 1969-07-20 20:18 executable
-prw------- $user/$group 0 1969-07-20 20:18 fifo
--rw------- $user/$group 1024 1969-07-20 20:18 file
-srwx------ $user/$group 0 1969-07-20 20:18 socket
+"-rw------- $user/$group 0 2009-10-03 23:48 .dotfile
+-rwx------ $user/$group 0 2009-10-03 23:48 executable
+prw------- $user/$group 0 2009-10-03 23:48 fifo
+-rw------- $user/$group 1024 2009-10-03 23:48 file
+srwx------ $user/$group 0 2009-10-03 23:48 socket
 $symlink_mode $user/$group $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -lF src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rwx------ $user/$group 0 1969-07-20 20:18 executable*
-prw------- $user/$group 0 1969-07-20 20:18 fifo|
--rw------- $user/$group 1024 1969-07-20 20:18 file
-srwx------ $user/$group 0 1969-07-20 20:18 socket=
+"-rwx------ $user/$group 0 2009-10-03 23:48 executable*
+prw------- $user/$group 0 2009-10-03 23:48 fifo|
+-rw------- $user/$group 1024 2009-10-03 23:48 file
+srwx------ $user/$group 0 2009-10-03 23:48 socket=
 $symlink_mode $user/$group $symlink_size $symlink_date symlink@ -> file"
 
 WVPASSEQ "$(bup ls -l --file-type src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rwx------ $user/$group 0 1969-07-20 20:18 executable
-prw------- $user/$group 0 1969-07-20 20:18 fifo|
--rw------- $user/$group 1024 1969-07-20 20:18 file
-srwx------ $user/$group 0 1969-07-20 20:18 socket=
+"-rwx------ $user/$group 0 2009-10-03 23:48 executable
+prw------- $user/$group 0 2009-10-03 23:48 fifo|
+-rw------- $user/$group 1024 2009-10-03 23:48 file
+srwx------ $user/$group 0 2009-10-03 23:48 socket=
 $symlink_mode $user/$group $symlink_size $symlink_date symlink@ -> file"
 
 WVPASSEQ "$(bup ls -ln src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rwx------ $uid/$gid 0 1969-07-20 20:18 executable
-prw------- $uid/$gid 0 1969-07-20 20:18 fifo
--rw------- $uid/$gid 1024 1969-07-20 20:18 file
-srwx------ $uid/$gid 0 1969-07-20 20:18 socket
+"-rwx------ $uid/$gid 0 2009-10-03 23:48 executable
+prw------- $uid/$gid 0 2009-10-03 23:48 fifo
+-rw------- $uid/$gid 1024 2009-10-03 23:48 file
+srwx------ $uid/$gid 0 2009-10-03 23:48 socket
 $symlink_mode $uid/$gid $symlink_size $symlink_date symlink -> file"
 
 WVPASSEQ "$(bup ls -ld "src/latest$tmpdir/src" | tr -s ' ' ' ')" \
-"drwx------ $user/$group 0 1969-07-20 20:18 src/latest$tmpdir/src"
+"drwx------ $user/$group 0 2009-10-03 23:48 src/latest$tmpdir/src"
 
 
 WVSTART "ls (backup set - long)"
@@ -206,15 +212,15 @@ l--------- ?/?"
 
 
 WVSTART "ls (dates TZ != UTC)"
-export TZ=US/Central
+export TZ=America/Chicago
 symlink_date_central="$(bup ls -l src/latest"$tmpdir"/src | grep symlink)"
 symlink_date_central="$(echo "$symlink_date_central" \
   | perl -ne 'm/.*? (\d+) (\d\d\d\d-\d\d-\d\d \d\d:\d\d)/ and print $2')"
 WVPASSEQ "$(bup ls -ln src/latest"$tmpdir"/src | tr -s ' ' ' ')" \
-"-rwx------ $uid/$gid 0 1969-07-20 15:18 executable
-prw------- $uid/$gid 0 1969-07-20 15:18 fifo
--rw------- $uid/$gid 1024 1969-07-20 15:18 file
-srwx------ $uid/$gid 0 1969-07-20 15:18 socket
+"-rwx------ $uid/$gid 0 2009-10-03 18:48 executable
+prw------- $uid/$gid 0 2009-10-03 18:48 fifo
+-rw------- $uid/$gid 1024 2009-10-03 18:48 file
+srwx------ $uid/$gid 0 2009-10-03 18:48 socket
 $symlink_mode $uid/$gid $symlink_size $symlink_date_central symlink -> file"
 unset TZ