From: Jim Meyering <meyering@redhat.com>
Date: Sun, 6 Jan 2008 11:38:18 +0000 (+0100)
Subject: touch: add a test for today's change.
X-Git-Tag: v6.9.92~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b76bc2b54180caa80afed4d88377ddd0f0ab6de;p=thirdparty%2Fcoreutils.git

touch: add a test for today's change.

* tests/touch/now-owned-by-other: New script.  Test today's change.
* tests/touch/Makefile.am (TESTS): Add now-owned-by-other.
* tests/Makefile.am (all_t): Add td, a new root-only test.
(td): New target.
* NEWS: Mention the improvement.
---

diff --git a/ChangeLog b/ChangeLog
index 9c8d418812..85dc1c1db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Jim Meyering  <meyering@redhat.com>
+
+	touch: add a test for today's change.
+	* tests/touch/now-owned-by-other: New script.  Test today's change.
+	* tests/touch/Makefile.am (TESTS): Add now-owned-by-other.
+	* tests/Makefile.am (all_t): Add td, a new root-only test.
+	(td): New target.
+	* NEWS: Mention the improvement.
+
 2008-01-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	touch: ignore "-d now" option, when appropriate
diff --git a/NEWS b/NEWS
index 5b1b3668bd..542e5f2eab 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,13 @@ GNU coreutils NEWS                                    -*- outline -*-
   env LC_CTYPE=en_US.iso88591 tr '[:upper:]' '[:lower:]'
   [bug introduced in coreutils-6.9.90]
 
+** Improvements
+
+  "touch -d now writable-but-owned-by-someone-else" now succeeds
+  whenever that same command would succeed without "-d now".
+  Before, it would work fine with no -d option, yet it would
+  fail with the ostensibly-equivalent "-d now".
+
 
 * Noteworthy changes in release 6.9.91 (2007-12-15) [beta]
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2db18f02a3..25ca509114 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,7 +48,7 @@ SUBDIRS = \
   uniq wc
 ## N O T E :: Please do not add new directories.
 
-all_t = t1 t2 t3 t4 t5 t6 t7 t8 t9 ta tb tc
+all_t = t1 t2 t3 t4 t5 t6 t7 t8 t9 ta tb tc td
 .PHONY: check-root $(all_t)
 check-root: $(all_t)
 
@@ -76,6 +76,8 @@ tb:
 	cd mv    && $(MAKE) check TESTS=sticky-to-xpart
 tc:
 	cd cp    && $(MAKE) check TESTS=preserve-gid
+td:
+	cd touch && $(MAKE) check TESTS=now-owned-by-other
 
 check-recursive: root-hint
 
diff --git a/tests/touch/Makefile.am b/tests/touch/Makefile.am
index d17213d393..8d90cbaca4 100644
--- a/tests/touch/Makefile.am
+++ b/tests/touch/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils tests for "touch".		-*-Makefile-*-
 
-# Copyright (C) 1998-2007 Free Software Foundation, Inc.
+# Copyright (C) 1998-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 = \
+  now-owned-by-other \
   read-only \
   relative \
   not-owner \
diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other
new file mode 100755
index 0000000000..0871ff7de1
--- /dev/null
+++ b/tests/touch/now-owned-by-other
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Demonstrate that "touch -d now writable-but-owned-by-other" works.
+
+# 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
+  touch --version
+fi
+
+. $srcdir/../envvar-check
+PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
+
+group_num=$(id -g $NON_ROOT_USERNAME)
+
+# Create a file owned by root, and writable by $NON_ROOT_USERNAME.
+echo > root-owned || framework_failure
+chgrp +$group_num . root-owned || framework_failure
+chmod g+w root-owned
+
+# Ensure that the current directory is searchable by $NON_ROOT_USERNAME.
+chmod g+x .
+
+setuidgid $NON_ROOT_USERNAME env PATH="$PATH" touch -d now root-owned || fail=1
+
+(exit $fail); exit $fail