From: Bruno Haible <bruno@clisp.org>
Date: Fri, 23 May 2008 01:39:25 +0000 (+0200)
Subject: Fix two commands in OSF/1 specific part.
X-Git-Tag: v0.1~7357
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=eb38f4544d905f75f1718c2ab4ab19e468c88315;p=gnulib.git

Fix two commands in OSF/1 specific part.
---

diff --git a/tests/test-copy-file.sh b/tests/test-copy-file.sh
index 722e50986..64901c8c4 100755
--- a/tests/test-copy-file.sh
+++ b/tests/test-copy-file.sh
@@ -47,7 +47,7 @@ cd "$builddir" ||
 ( cd "$tmp"
 
   # Prepare tmpfile0.
-  rm -f tmpfile[0-9] tmpaclout[12]
+  rm -f tmpfile[0-9] tmpaclout[0-2]
   echo "Simple contents" > tmpfile0
   chmod 600 tmpfile0
 
@@ -322,7 +322,7 @@ cd "$builddir" ||
         func_test_copy tmpfile0 tmpfile3
 
         # Set an ACL for other.
-        setacl -u other:4 tmpfile0
+        setacl -u other::4 tmpfile0
 
         func_test_copy tmpfile0 tmpfile4
 
@@ -331,10 +331,12 @@ cd "$builddir" ||
 
         func_test_copy tmpfile0 tmpfile5
 
-        # Remove the ACL for other.
-        setacl -x other:4 tmpfile0
+        if false; then # would give an error "can't set ACL: Invalid argument"
+          # Remove the ACL for other.
+          setacl -x other::4 tmpfile0
 
-        func_test_copy tmpfile0 tmpfile6
+          func_test_copy tmpfile0 tmpfile6
+        fi
 
         # Remove the ACL for the group.
         setacl -x group:$agid:4 tmpfile0
@@ -350,7 +352,8 @@ cd "$builddir" ||
         # Copy ACLs from a file that has no ACLs.
         echo > tmpfile9
         chmod a+x tmpfile9
-        getacl tmpfile9 | setacl -b -U - tmpfile0
+        getacl tmpfile9 > tmpaclout0
+        setacl -b -U tmpaclout0 tmpfile0
         rm -f tmpfile9
 
         func_test_copy tmpfile0 tmpfile9
@@ -478,7 +481,7 @@ cd "$builddir" ||
     esac
   fi
 
-  rm -f tmpfile[0-9] tmpaclout[12]
+  rm -f tmpfile[0-9] tmpaclout[0-2]
 ) || exit 1
 
 rm -rf "$tmp"