tests.sh: Try a bit harder to clean up scratch

This matters if some directories aren't readable/searchable and we get
^C'd, for example.

1 files changed, 3 insertions, 4 deletions

diff --git a/tests.sh b/tests.sh
index fd8d4a1..65d22ee 100755
--- a/tests.sh
+++ b/tests.sh
@@ -683,10 +683,6 @@ chown "$(id -u):$(id -g)" "$TMP"
 
 # Clean up temporary directories on exit
 function cleanup() {
-    if [ ! "$CLEAN" ]; then
-        return
-    fi
-
     # Don't force rm to deal with long paths
     for dir in "$TMP"/deep/*/*; do
         if [ -d "$dir" ]; then
@@ -694,6 +690,9 @@ function cleanup() {
         fi
     done
 
+    # In case a test left anything weird in scratch/
+    chmod -R +rX scratch
+
     rm -rf "$TMP"
 }