acl/patches/acl-2.2.49-tests.patch

   1 diff --git a/test/cp.test b/test/cp.test
   2 index a888c04..4a75ffd 100644
   3 --- a/test/cp.test
   4 +++ b/test/cp.test
   5 @@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given.
   6         > -rw-rw-r--+
   7
   8         $ cp f g
   9 -       $ ls -l g | awk -- '{ print $1 }'
  10 +       $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//'
  11         > -rw-r--r--
  12
  13         $ rm g
  14 diff --git a/test/getfacl-recursive.test b/test/getfacl-recursive.test
  15 index b88c211..a72192e 100644
  16 --- a/test/getfacl-recursive.test
  17 +++ b/test/getfacl-recursive.test
  18 @@ -1,5 +1,6 @@
  19  Tests for proper path recursion
  20
  21 +       $ umask 022
  22         $ mkdir -p 1/2/3
  23         $ mkdir 1/link
  24         $ touch 1/link/file
  25 diff --git a/test/misc.test b/test/misc.test
  26 index 7c62c64..e6140da 100644
  27 --- a/test/misc.test
  28 +++ b/test/misc.test
  29 @@ -254,7 +254,7 @@ Add some users and groups
  30  Symlink in directory with default ACL?
  31
  32         $ ln -s d d/l
  33 -       $ ls -dl d/l | awk '{print $1}'
  34 +       $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//'
  35         > lrwxrwxrwx
  36
  37         $ ls -dl -L d/l | awk '{print $1}'
  38 @@ -343,7 +343,7 @@ Remove the default ACL
  39  Reset to base entries
  40
  41         $ setfacl -b d
  42 -       $ ls -dl d | awk '{print $1}'
  43 +       $ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
  44         > drwxr-x---
  45
  46         $ getfacl --omit-header d
  47 @@ -355,7 +355,7 @@ Reset to base entries
  48  Now, chmod should change the group_obj entry
  49
  50         $ chmod 775 d
  51 -       $ ls -dl d | awk '{print $1}'
  52 +       $ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
  53         > drwxrwxr-x
  54
  55         $ getfacl --omit-header d
  56 diff --git a/test/root/permissions.test b/test/root/permissions.test
  57 index afaf5f0..4880bd2 100644
  58 --- a/test/root/permissions.test
  59 +++ b/test/root/permissions.test
  60 @@ -20,7 +20,7 @@ defined permissions.
  61         $ cd d
  62         $ umask 027
  63         $ touch f
  64 -       $ ls -l f | awk -- '{ print $1, $3, $4 }'
  65 +       $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
  66         > -rw-r----- root root
  67
  68
  69 @@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this
  70  gives user bin write access.
  71
  72         $ chown bin:bin f
  73 -       $ ls -l f | awk -- '{ print $1, $3, $4 }'
  74 +       $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
  75         > -rw-r----- bin bin
  76         $ su bin
  77         $ echo bin >> f
  78 @@ -257,12 +257,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
  79         $ mkdir -m 600 x
  80         $ chown daemon:daemon x
  81         $ echo j > x/j
  82 -       $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
  83 +       $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
  84         > -rw-r----- root root
  85
  86         $ setfacl -m u:daemon:r x
  87
  88 -       $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
  89 +       $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/---\\./---/'
  90         > -rw-r----- root root
  91         (With the bug this gives: `ls: x/j: Permission denied'.)
  92
  93 diff --git a/test/root/restore.test b/test/root/restore.test
  94 index 6003cd4..5dbf73c 100644
  95 --- a/test/root/restore.test
  96 +++ b/test/root/restore.test
  97 @@ -17,7 +17,7 @@ Ensure setuid bit is restored when the owner changes
  98         $ chown bin passwd
  99         $ chmod u+s passwd
 100         $ setfacl --restore passwd.acl
 101 -       $ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
 102 +       $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\. root/ root/'
 103         > -rwsr-xr-x root root
 104
 105         $ rm passwd passwd.acl
 106 diff --git a/test/root/setfacl.test b/test/root/setfacl.test
 107 index 630e9fb..dd7fe08 100644
 108 --- a/test/root/setfacl.test
 109 +++ b/test/root/setfacl.test
 110 @@ -8,7 +8,7 @@ Setfacl utility tests. Run these tests on a filesystem with ACL support.
 111         $ sg bin
 112         $ umask 027
 113         $ touch g
 114 -       $ ls -dl g | awk '{print $1}'
 115 +       $ ls -dl g | awk '{print $1}' | sed 's/\\.$//'
 116         > -rw-r-----
 117
 118         $ setfacl -m m:- g
 119 diff --git a/test/sbits-restore.test b/test/sbits-restore.test
 120 index e5e4fb2..abdb58a 100644
 121 --- a/test/sbits-restore.test
 122 +++ b/test/sbits-restore.test
 123 @@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works
 124         $ touch d/g
 125         $ touch d/u
 126         $ setfacl --restore d.acl
 127 -       $ ls -dl d | awk '{print $1}'
 128 +       $ ls -dl d | awk '{print $1}' | sed 's/\\.$//'
 129         > drwxr-xr-t
 130 -       $ ls -dl d/u | awk '{print $1}'
 131 +       $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//'
 132         > -rwSr--r--
 133 -       $ ls -dl d/g | awk '{print $1}'
 134 +       $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//'
 135         > -rw-r-Sr--
 136         $ rm -Rf d