acl, file-has-acl, copy-file tests: Remove support for IRIX.

* tests/test-file-has-acl.sh: Remove code for IRIX ACLs.
* tests/test-set-mode-acl.sh: Likewise.
* tests/test-copy-acl.sh: Likewise.
* tests/test-copy-file.sh: Likewise.
* tests/test-sameacls.c: Update comment.

diff --git a/ChangeLog b/ChangeLog
index 8ff66910a1d377ecff1e2bd0d49ebf5fae42d107..23aa790dd6b0cbce7eb4585e90e20e18c506f627 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-09-10  Bruno Haible  <bruno@clisp.org>
+
+       acl, file-has-acl, copy-file tests: Remove support for IRIX.
+       * tests/test-file-has-acl.sh: Remove code for IRIX ACLs.
+       * tests/test-set-mode-acl.sh: Likewise.
+       * tests/test-copy-acl.sh: Likewise.
+       * tests/test-copy-file.sh: Likewise.
+       * tests/test-sameacls.c: Update comment.
+
 2025-09-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        regex: pacify gcc 15.2

diff --git a/tests/test-copy-acl.sh b/tests/test-copy-acl.sh
index 19d6d7763cb8d4ae5f542862d55407e65a688870..c9fd5f50494ed024d8213bceb1138db842c9b028 100755 (executable)
--- a/tests/test-copy-acl.sh
+++ b/tests/test-copy-acl.sh
@@ -65,7 +65,7 @@ cd "$builddir" ||
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, irix, none.
+  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, none.
   # TODO: Support also native Windows platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
@@ -92,7 +92,7 @@ cd "$builddir" ||
   else
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
-      # HP-UX, sometimes also IRIX.
+      # HP-UX.
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
         # HP-UX 11.11 or newer.
         acl_flavor=hpuxjfs
@@ -112,11 +112,6 @@ cd "$builddir" ||
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
             # Mac OS X.
             acl_flavor=macosx
-          else
-            if test -f /sbin/chacl; then
-              # IRIX.
-              acl_flavor=irix
-            fi
           fi
         fi
       fi
@@ -180,14 +175,6 @@ cd "$builddir" ||
         cmp tmpaclout1 tmpaclout2 > /dev/null
       }
       ;;
-    irix)
-      func_test_same_acls ()
-      {
-        /bin/ls -lD "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-        /bin/ls -lD "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-        cmp tmpaclout1 tmpaclout2 > /dev/null
-      }
-      ;;
     none)
       func_test_same_acls ()
       {
@@ -570,35 +557,6 @@ cd "$builddir" ||
 
         ;;
 
-      irix)
-
-        # Set an ACL for a user.
-        /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x,group:$agid:r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        /sbin/chacl user::rw-,group::---,user:$auid:--x,group:$agid:r--,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        /sbin/chacl user::rw-,group::---,group:$agid:r--,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        /sbin/chacl user::rw-,group::---,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile7
-
-        ;;
-
     esac
   fi
 

diff --git a/tests/test-copy-file.sh b/tests/test-copy-file.sh
index 1283af77908c9a702e799b4faa401c4477df10df..0476a3959a68a7ce5c31791fe8c3e3398311db7b 100755 (executable)
--- a/tests/test-copy-file.sh
+++ b/tests/test-copy-file.sh
@@ -59,7 +59,7 @@ cd "$builddir" ||
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, irix, none.
+  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, none.
   # TODO: Support also native Windows platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
@@ -86,7 +86,7 @@ cd "$builddir" ||
   else
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
-      # HP-UX, sometimes also IRIX.
+      # HP-UX.
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
         # HP-UX 11.11 or newer.
         acl_flavor=hpuxjfs
@@ -106,11 +106,6 @@ cd "$builddir" ||
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
             # Mac OS X.
             acl_flavor=macosx
-          else
-            if test -f /sbin/chacl; then
-              # IRIX.
-              acl_flavor=irix
-            fi
           fi
         fi
       fi
@@ -174,14 +169,6 @@ cd "$builddir" ||
         cmp tmpaclout1 tmpaclout2 > /dev/null
       }
       ;;
-    irix)
-      func_test_same_acls ()
-      {
-        /bin/ls -lD "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
-        /bin/ls -lD "$2" | sed -e "s/$2/FILENAME/g" > tmpaclout2
-        cmp tmpaclout1 tmpaclout2 > /dev/null
-      }
-      ;;
     none)
       func_test_same_acls ()
       {
@@ -562,35 +549,6 @@ cd "$builddir" ||
 
         ;;
 
-      irix)
-
-        # Set an ACL for a user.
-        /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x tmpfile0
-
-        func_test_copy tmpfile0 tmpfile2
-
-        # Set an ACL for a group.
-        /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x,group:$agid:r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile3
-
-        # Set an ACL for other.
-        /sbin/chacl user::rw-,group::---,user:$auid:--x,group:$agid:r--,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile4
-
-        # Remove the ACL for the user.
-        /sbin/chacl user::rw-,group::---,group:$agid:r--,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile5
-
-        # Remove the ACL for the group.
-        /sbin/chacl user::rw-,group::---,other::r-- tmpfile0
-
-        func_test_copy tmpfile0 tmpfile7
-
-        ;;
-
     esac
   fi
 

diff --git a/tests/test-file-has-acl.sh b/tests/test-file-has-acl.sh
index 76391ee6c7361d9a0ca29895e9a1a72418fbe88a..4f98763f3ce02764fcd1cc9b88ad6c66a72cfcad 100755 (executable)
--- a/tests/test-file-has-acl.sh
+++ b/tests/test-file-has-acl.sh
@@ -65,7 +65,7 @@ cd "$builddir" ||
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, irix, none.
+  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, none.
   # TODO: Support also native Windows platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
@@ -92,7 +92,7 @@ cd "$builddir" ||
   else
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
-      # HP-UX, sometimes also IRIX.
+      # HP-UX.
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
         # HP-UX 11.11 or newer.
         acl_flavor=hpuxjfs
@@ -112,11 +112,6 @@ cd "$builddir" ||
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
             # Mac OS X.
             acl_flavor=macosx
-          else
-            if test -f /sbin/chacl; then
-              # IRIX.
-              acl_flavor=irix
-            fi
           fi
         fi
       fi
@@ -164,26 +159,6 @@ cd "$builddir" ||
         esac
       }
       ;;
-    irix)
-      func_test_has_acl ()
-      {
-        func_test_file_has_acl "$1" "$2"
-        case `/bin/ls -ldD "$1" | sed 1q` in
-          *" []")
-            test "$2" = no || {
-              echo "/bin/ls -ldD $1 shows no ACL, but expected $2" 1>&2
-              exit 1
-            }
-            ;;
-          *)
-            test "$2" = yes || {
-              echo "/bin/ls -ldD $1 shows an ACL, but expected $2" 1>&2
-              exit 1
-            }
-            ;;
-        esac
-      }
-      ;;
     *)
       func_test_has_acl ()
       {
@@ -337,23 +312,6 @@ cd "$builddir" ||
 
         ;;
 
-      irix)
-
-        # Set an ACL for a user.
-        /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x tmpfile0 2> tmp.err
-        cat tmp.err 1>&2
-        if test -s tmp.err; then :; else
-
-          func_test_has_acl tmpfile0 yes
-
-          # Remove the ACL for the user.
-          /sbin/chacl user::rw-,group::---,other::--- tmpfile0
-
-          func_test_has_acl tmpfile0 no
-
-        fi
-        ;;
-
     esac
   fi
 

diff --git a/tests/test-sameacls.c b/tests/test-sameacls.c
index 688a267e43eba396f8276c345f67c911a8e8d7e3..9c487b4ccb03367c1c567aeb0c6510f3acad870f 100644 (file)
--- a/tests/test-sameacls.c
+++ b/tests/test-sameacls.c
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
       }
   }
   {
-#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX */
+#if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X */
     static const int types[] =
       {
         ACL_TYPE_ACCESS

diff --git a/tests/test-set-mode-acl.sh b/tests/test-set-mode-acl.sh
index 6d103fb9a3a07aaa89078a28a61c6090708074e5..feefc798c6e8ee50fe56c12b476982270a82bc3c 100755 (executable)
--- a/tests/test-set-mode-acl.sh
+++ b/tests/test-set-mode-acl.sh
@@ -65,7 +65,7 @@ cd "$builddir" ||
   # Classification of the platform according to the programs available for
   # manipulating ACLs.
   # Possible values are:
-  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, irix, none.
+  #   linux, cygwin, freebsd, solaris, hpux, hpuxjfs, aix, macosx, none.
   # TODO: Support also native Windows platforms (mingw).
   acl_flavor=none
   if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then
@@ -92,7 +92,7 @@ cd "$builddir" ||
   else
     if (lsacl / >/dev/null) 2>/dev/null; then
       # Platforms with the lsacl and chacl programs.
-      # HP-UX, sometimes also IRIX.
+      # HP-UX.
       if (getacl tmpfile0 >/dev/null) 2>/dev/null; then
         # HP-UX 11.11 or newer.
         acl_flavor=hpuxjfs
@@ -112,11 +112,6 @@ cd "$builddir" ||
           if (fsaclctl -v >/dev/null) 2>/dev/null; then
             # Mac OS X.
             acl_flavor=macosx
-          else
-            if test -f /sbin/chacl; then
-              # IRIX.
-              acl_flavor=irix
-            fi
           fi
         fi
       fi
@@ -199,9 +194,6 @@ cd "$builddir" ||
           macosx)
             /bin/chmod +a "user:daemon allow execute" tmpfile0
             ;;
-          irix)
-            /sbin/chacl user::rw-,group::---,other::---,user:$auid:--x tmpfile0
-            ;;
         esac
 
         # Try to set the ACL to only the given mode.