X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c6fbd563d8f9b91dc871ec62fa6dbe309ff1c801..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/executability.test

diff --git a/testsuite/executability.test b/testsuite/executability.test
index 8ea8fb5b..b11e6722 100644
--- a/testsuite/executability.test
+++ b/testsuite/executability.test
@@ -1,23 +1,12 @@
 #! /bin/sh
 
-# This program is distributable under the terms of the GNU GPL see
+# This program is distributable under the terms of the GNU GPL (see
 # COPYING).
 
 # Test the --executability or -E option. -- Matt McCutchen
 
 . $srcdir/testsuite/rsync.fns
 
-set -x
-
-P600='^-rw-------'
-P604='^-rw----r--'
-P700='^-rwx------'
-P705='^-rwx---r-x'
-
-check_perms() {
-    $TOOLDIR/tls "$1" | grep "$2" >/dev/null
-}
-
 # Put some files in the From directory
 mkdir "$fromdir"
 cat <<EOF >"$fromdir/1"
@@ -29,13 +18,13 @@ cat <<EOF >"$fromdir/2"
 echo 'Program Two!'
 EOF
 
-chmod 700 "$fromdir/1" || test_skipped "Can't chmod"
+chmod 1700 "$fromdir/1" || test_skipped "Can't chmod"
 chmod 600 "$fromdir/2"
 
 $RSYNC -rvv "$fromdir/" "$todir/"
 
-check_perms "$todir/1" $P700 || test_fail "After initial transfer: to/1 should have 700 permissions"
-check_perms "$todir/2" $P600 || test_fail "After initial transfer: to/2 should have 600 permissions"
+check_perms "$todir/1" rwx------ 1
+check_perms "$todir/2" rw------- 1
 
 # Mix up the permissions a bit
 chmod 600 "$fromdir/1"
@@ -45,14 +34,14 @@ chmod 604 "$todir/2"
 $RSYNC -rvv "$fromdir/" "$todir/"
 
 # No -E, so nothing should have changed
-check_perms "$todir/1" $P700 || test_fail "After update without -E: to/1 should still have 700 permissions"
-check_perms "$todir/2" $P604 || test_fail "After update without -E: to/2 should still have 604 permissions"
+check_perms "$todir/1" rwx------ 2
+check_perms "$todir/2" rw----r-- 2
 
 $RSYNC -rvvE "$fromdir/" "$todir/"
 
 # Now things should have happened!
-check_perms "$todir/1" $P600 || test_fail "After update with -E: to/1 should now have 600 permissions"
-check_perms "$todir/2" $P705 || test_fail "After update with -E: to/2 should now have 705 permissions"
+check_perms "$todir/1" rw------- 3
+check_perms "$todir/2" rwx---r-x 3
 
 # Hooray
 exit 0