Skip test when a hard link cannot be created.

diff --git a/ChangeLog b/ChangeLog
index b2a59dda6d71e88082c5956b48cace7ec1bcaa2a..f77389c2a13d0296692eca85fb89bce2b86c538b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-19  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-link.c: Include <errno.h>.
+       (main): Exit with code 77 when a hard link cannot be created due to
+       the file system.
+       * tests/test-link.sh: Skip test when a hard link cannot be created due
+       to the file system.
+       Suggested by Eric Blake.
+
 2009-01-19  Martin Lambers  <marlam@marlam.de>
 
        * modules/link-tests: New file.

diff --git a/tests/test-link.c b/tests/test-link.c
index 255a939e6d1f4294008e5cc3a827ad86916e81d2..a358921131a8f925f755a02c25196fe467724c34 100644 (file)
--- a/tests/test-link.c
+++ b/tests/test-link.c
@@ -18,6 +18,7 @@
 
 #include <unistd.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -36,8 +37,20 @@
 int
 main (int argc, char **argv)
 {
+  int ret;
+
   ASSERT (argc == 3);
-  ASSERT (link (argv[1], argv[2]) == 0);
+
+  ret = link (argv[1], argv[2]);
+  if (ret < 0)
+    {
+      /* If the device does not support hard links, errno is
+        EPERM on Linux, EOPNOTSUPP on FreeBSD.  */
+      if (errno == EPERM || errno == EOPNOTSUPP)
+       return 77;
+      perror ("link");
+      return 1;
+    }
 
   return 0;
 }

diff --git a/tests/test-link.sh b/tests/test-link.sh
index e18bb63fce348e6dcf17070c77cd4998561bb2af..1519f9d9a801637e61e2e9fee18c50d2ca609fa5 100755 (executable)
--- a/tests/test-link.sh
+++ b/tests/test-link.sh
@@ -7,7 +7,16 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 echo "hello" > test-link-a.txt || exit 1
 
 # Use link() to create a new name for it.
-./test-link${EXEEXT} test-link-a.txt test-link-b.txt || exit 1
+./test-link${EXEEXT} test-link-a.txt test-link-b.txt
+case $? in
+  0) ;;
+  77)
+    echo "Skipping test: hard links are not supported on this file system"
+    rm -fr $tmpfiles
+    exit 77
+    ;;
+  *) exit 1 ;;
+esac
 cmp test-link-a.txt test-link-b.txt || exit 1
 
 # Modify the contents of the first file.