From: Bruno Haible <bruno@clisp.org>
Date: Mon, 5 Sep 2011 09:23:55 +0000 (+0200)
Subject: acl: Try unit tests on more file systems.
X-Git-Tag: v0.1~1958
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=977389d936eb39475d8540651074ab48fcfd85a1;p=gnulib.git

acl: Try unit tests on more file systems.

* tests/test-file-has-acl-1.sh: New file.
* tests/test-file-has-acl-2.sh: New file.
* tests/test-set-mode-acl-1.sh: New file.
* tests/test-set-mode-acl-2.sh: New file.
* tests/test-copy-acl-1.sh: New file.
* tests/test-copy-acl-2.sh: New file.
* modules/acl-tests (Files): Add them.
(Makefile.am): Add them to TESTS.
---

diff --git a/ChangeLog b/ChangeLog
index 7efe528497..fcc419d8d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-05  Bruno Haible  <bruno@clisp.org>
+
+	acl: Try unit tests on more file systems.
+	* tests/test-file-has-acl-1.sh: New file.
+	* tests/test-file-has-acl-2.sh: New file.
+	* tests/test-set-mode-acl-1.sh: New file.
+	* tests/test-set-mode-acl-2.sh: New file.
+	* tests/test-copy-acl-1.sh: New file.
+	* tests/test-copy-acl-2.sh: New file.
+	* modules/acl-tests (Files): Add them.
+	(Makefile.am): Add them to TESTS.
+
 2011-09-04  Bruno Haible  <bruno@clisp.org>
 
 	acl: Improve support of NFSv4 ACLs on Solaris 10 (newer version).
diff --git a/modules/acl-tests b/modules/acl-tests
index 3ab99972c6..36908b3110 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -1,7 +1,13 @@
 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
@@ -18,7 +24,10 @@ configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])
 
 Makefile.am:
-TESTS += test-file-has-acl.sh test-set-mode-acl.sh test-copy-acl.sh
+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)
diff --git a/tests/test-copy-acl-1.sh b/tests/test-copy-acl-1.sh
new file mode 100755
index 0000000000..2f9880e04f
--- /dev/null
+++ b/tests/test-copy-acl-1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Test copy-acl on the file system of /var/tmp, which usually is a local
+# file system.
+
+if test -d /var/tmp; then
+  TMPDIR=/var/tmp
+else
+  TMPDIR=/tmp
+fi
+export TMPDIR
+
+exec "${srcdir}/test-copy-acl.sh"
diff --git a/tests/test-copy-acl-2.sh b/tests/test-copy-acl-2.sh
new file mode 100755
index 0000000000..984602d9c9
--- /dev/null
+++ b/tests/test-copy-acl-2.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Test copy-acl on the file system of the build directory, which may be
+# a local file system or NFS mounted.
+
+TMPDIR=`pwd`
+export TMPDIR
+
+exec "${srcdir}/test-copy-acl.sh"
diff --git a/tests/test-file-has-acl-1.sh b/tests/test-file-has-acl-1.sh
new file mode 100755
index 0000000000..e3ad9c0e8c
--- /dev/null
+++ b/tests/test-file-has-acl-1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Test file-has-acl on the file system of /var/tmp, which usually is a local
+# file system.
+
+if test -d /var/tmp; then
+  TMPDIR=/var/tmp
+else
+  TMPDIR=/tmp
+fi
+export TMPDIR
+
+exec "${srcdir}/test-file-has-acl.sh"
diff --git a/tests/test-file-has-acl-2.sh b/tests/test-file-has-acl-2.sh
new file mode 100755
index 0000000000..6b92b1d928
--- /dev/null
+++ b/tests/test-file-has-acl-2.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Test file-has-acl on the file system of the build directory, which may be
+# a local file system or NFS mounted.
+
+TMPDIR=`pwd`
+export TMPDIR
+
+exec "${srcdir}/test-file-has-acl.sh"
diff --git a/tests/test-set-mode-acl-1.sh b/tests/test-set-mode-acl-1.sh
new file mode 100755
index 0000000000..68c247cd15
--- /dev/null
+++ b/tests/test-set-mode-acl-1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Test set-mode-acl on the file system of /var/tmp, which usually is a local
+# file system.
+
+if test -d /var/tmp; then
+  TMPDIR=/var/tmp
+else
+  TMPDIR=/tmp
+fi
+export TMPDIR
+
+exec "${srcdir}/test-set-mode-acl.sh"
diff --git a/tests/test-set-mode-acl-2.sh b/tests/test-set-mode-acl-2.sh
new file mode 100755
index 0000000000..d1377dfc8f
--- /dev/null
+++ b/tests/test-set-mode-acl-2.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Test set-mode-acl on the file system of the build directory, which may be
+# a local file system or NFS mounted.
+
+TMPDIR=`pwd`
+export TMPDIR
+
+exec "${srcdir}/test-set-mode-acl.sh"