X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Facl-tests;h=36908b31102bd635b502f7166fafdb332a98ea7d;hb=5c508f686b9a0f986ac5d941d7be237ec047aedb;hp=f9e752524eb5b3b237f79645f2b87f79b156fd2d;hpb=456355401219fdc2cb203baedd2bf176572e8310;p=gnulib.git

diff --git a/modules/acl-tests b/modules/acl-tests
index f9e752524..36908b311 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -1,11 +1,18 @@
 Files:
 tests/test-file-has-acl.sh
+tests/test-file-has-acl-1.sh
+tests/test-file-has-acl-2.sh
 tests/test-set-mode-acl.sh
+tests/test-set-mode-acl-1.sh
+tests/test-set-mode-acl-2.sh
 tests/test-copy-acl.sh
+tests/test-copy-acl-1.sh
+tests/test-copy-acl-2.sh
 tests/test-file-has-acl.c
 tests/test-set-mode-acl.c
 tests/test-copy-acl.c
 tests/test-sameacls.c
+tests/macros.h
 
 Depends-on:
 progname
@@ -14,24 +21,14 @@ unistd
 xalloc
 
 configure.ac:
-AC_REQUIRE([gl_FUNC_ACL])
-save_LIBS="$LIBS"
-LIBS="$LIB_ACL $LIBS"
-dnl Test for functions present on Linux, FreeBSD, MacOS X, IRIX, Tru64.
-AC_CHECK_FUNCS([acl_get_file])
-dnl Test for functions present on Solaris, Cygwin.
-AC_CHECK_FUNCS([acl])
-dnl Test for functions present on HP-UX.
-AC_CHECK_FUNCS([getacl])
-dnl Test for functions present on AIX.
-AC_CHECK_FUNCS([aclx_get])
-dnl Test for functions present on older AIX.
-AC_CHECK_FUNCS([statacl])
-LIBS="$save_LIBS"
+AC_CHECK_DECLS_ONCE([alarm])
 
 Makefile.am:
-TESTS += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
+TESTS += \
+  test-file-has-acl.sh test-file-has-acl-1.sh test-file-has-acl-2.sh \
+  test-set-mode-acl.sh test-set-mode-acl-1.sh test-set-mode-acl-2.sh \
+  test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh
+TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-file-has-acl test-set-mode-acl test-copy-acl test-sameacls
 test_file_has_acl_LDADD = $(LDADD) $(LIB_ACL)
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@