Keep permission testing.

Author: jlevy

tests/run.sh

@@ -53,12 +53,18 @@ echo "Now diffing: git diff $clean_log > $final_diff"
 git diff $clean_log > $final_diff
 
 if [ ! -s "$final_diff" ]; then
+    echo
     echo "Success! No differences found."
     exit 0
 else
+    echo
     echo "Warning: Differences detected:"
+    echo "----------------------------------------"
     cat $final_diff
-    echo "Review and fix or commit the new $clean_log file if it is correct."
+    echo "----------------------------------------"
+    echo
+    echo "Tests did not pass!"
+    echo "Review the diffs above, then fix or commit the new $clean_log file if it is correct."
 
     exit 1
 fi

tests/tests-clean.log

@@ -82,8 +82,8 @@ Read 1 files (0 chars), found 0 matches (0 skipped due to overlaps)
 Dry run: Would have changed 1 files (0 rewritten and 1 renamed)
 
 ls_portable test2
-humpty-dumpty.txt
-stuff/
+-rw-r--r-- humpty-dumpty.txt
+drwxr-xr-x stuff/
 
 run --renames --from humpty --to dumpty test2
 Using 1 patterns:
@@ -94,8 +94,8 @@ Read 1 files (0 chars), found 0 matches (0 skipped due to overlaps)
 Changed 1 files (0 rewritten and 1 renamed)
 
 ls_portable test2
-dumpty-dumpty.txt
-stuff/
+-rw-r--r-- dumpty-dumpty.txt
+drwxr-xr-x stuff/
 
 diff -r original test2 || expect_error
 Only in test2: dumpty-dumpty.txt
@@ -118,8 +118,8 @@ Read 12 files (3810 chars), found 3 matches (0 skipped due to overlaps)
 Dry run: Would have changed 1 files (1 rewritten and 1 renamed)
 
 ls_portable test3
-humpty-dumpty.txt
-stuff/
+-rw-r--r-- humpty-dumpty.txt
+drwxr-xr-x stuff/
 
 run --full -i --from humpty --to dumpty test3
 Using 1 patterns:
@@ -131,9 +131,9 @@ Read 12 files (3810 chars), found 3 matches (0 skipped due to overlaps)
 Changed 1 files (1 rewritten and 1 renamed)
 
 ls_portable test3
-dumpty-dumpty.txt
-humpty-dumpty.txt.orig
-stuff/
+-rw-r--r-- dumpty-dumpty.txt
+-rw-r--r-- humpty-dumpty.txt.orig
+drwxr-xr-x stuff/
 
 diff -r original test3 || expect_error
 Only in test3: dumpty-dumpty.txt

tests/tests.sh

@@ -23,8 +23,9 @@ expect_error() {
 }
 
 # A trick to do ls portably, showing just files and types.
+# Macos appends an @ to permissions, so we strip it.
 ls_portable() {
-  ls -1F "$@"
+  ls -lF "$@" | tail -n +2 | awk '{gsub(/@/, "", $1); print $1, $NF}'
 }
 
 # This will echo all commands as they are read. Bash commands plus their