From 67db18ce0ffc516eb0f39bf8ff3d8151ae810fc9 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Thu, 28 May 2015 01:26:08 +0100 Subject: copy: prefer our hardlink to symlink emulation on OS X 10.10 * src/copy.c (CAN_HARDLINK_SYMLINKS): Don't enable use of linkat() on Darwin 14, as the gnulib fallback emulation there doesn't preserve ownership and timestamps etc. This fixes a test failure in tests/cp/link-symlink.sh * tests/cp/link-deref.sh: Adjust accordingly. --- tests/cp/link-deref.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/cp/link-deref.sh b/tests/cp/link-deref.sh index 98d264408..b0efb6f84 100755 --- a/tests/cp/link-deref.sh +++ b/tests/cp/link-deref.sh @@ -19,7 +19,8 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp -if grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \ +if { grep '^#define HAVE_LINKAT 1' "$CONFIG_HEADER" > /dev/null \ + && grep '#undef LINKAT_SYMLINK_NOTSUP' "$CONFIG_HEADER" > /dev/null; } \ || grep '^#define LINK_FOLLOWS_SYMLINKS 0' "$CONFIG_HEADER" > /dev/null; then # With this config cp will attempt to linkat() to hardlink a symlink. # So now double check the current file system supports this operation. -- cgit v1.2.3-70-g09d2