cp: add a test for today's bug fix.

* tests/cp/parent-perm: New script.  Test today's change.
Based on reproducer from Jan Blunck.
* tests/cp/Makefile.am (TESTS): Add parent-perm.

3 files changed, 47 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 85dc1c1db..29ae607aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-07  Jim Meyering  <meyering@redhat.com>
+
+	cp: add a test for today's bug fix.
+	* tests/cp/parent-perm: New script.  Test today's change.
+	Based on reproducer from Jan Blunck.
+	* tests/cp/Makefile.am (TESTS): Add parent-perm.
+
 2008-01-06  Jim Meyering  <meyering@redhat.com>
 
 	touch: add a test for today's change.
diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index 4af269c48..e2f96c9e3 100644
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils tests for cp.				-*-Makefile-*-
 
-# Copyright (C) 1997-2001, 2003, 2005-2007 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003, 2005-2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 TESTS = \
+  parent-perm \
   abuse \
   proc-zero-len \
   thru-dangling \
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
new file mode 100755
index 000000000..1c7a222bb
--- /dev/null
+++ b/tests/cp/parent-perm
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Ensure that cp --parents works properly with a preexisting dest. directory
+
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  cp --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../test-lib.sh
+
+mkdir -p a/b/c a/b/d e || framework_failure
+touch a/b/c/foo a/b/d/foo || framework_failure
+cp -p --parent a/b/c/foo e || framework_failure
+
+fail=0
+cp -p --parent a/b/d/foo e || fail=1
+
+# Ensure that permissions on just-created directory, e/a/,
+# are the same as those on original, a/.
+test $(stat --printf %A a) = $(stat --printf %A e/a) || fail=1
+
+(exit $fail); exit $fail