From eed743342cfa0ff8cc69666243233229e7417f8f Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 30 Jan 2008 21:23:16 +0100 Subject: [PATCH] Split instsh2.test, so that only the new part requires non-root. * tests/instsh2.test: Split off testing of `install-sh -C' ... * tests/instsh3.test: ... to this new test, requiring non-root. * tests/Makefile.am: Adjust. * THANKS: Update. Report by Theodoros V. Kalamatianos. --- ChangeLog | 8 ++++++++ THANKS | 1 + tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/instsh2.test | 16 +--------------- tests/instsh3.test | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 15 deletions(-) create mode 100755 tests/instsh3.test diff --git a/ChangeLog b/ChangeLog index aa5e7b229..d07b13596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-30 Ralf Wildenhues + + * tests/instsh2.test: Split off testing of `install-sh -C' ... + * tests/instsh3.test: ... to this new test, requiring non-root. + * tests/Makefile.am: Adjust. + * THANKS: Update. + Report by Theodoros V. Kalamatianos. + 2008-01-23 Ralf Wildenhues * tests/nobase.test: Extend test to generated files. diff --git a/THANKS b/THANKS index f84e625fb..86e7e362c 100644 --- a/THANKS +++ b/THANKS @@ -294,6 +294,7 @@ Tamara L. Dahlgren dahlgren1@llnl.gov Tatu Ylonen ylo@ssh.fi Teun Burgers burgers@ecn.nl The Crimson Binome steve@nyongwa.montreal.qc.ca +Theodoros V. Kalamatianos thkala@gmail.com Thien-Thi Nguyen ttn@glug.org Thomas Fitzsimmons fitzsim@redhat.com Thomas Gagne tgagne@ix.netcom.com diff --git a/tests/Makefile.am b/tests/Makefile.am index ec10801a2..8405c7ac0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -293,6 +293,7 @@ install2.test \ installdir.test \ instsh.test \ instsh2.test \ +instsh3.test \ instdat.test \ instdat2.test \ instexec.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 6ba81ab0b..1bcb573ef 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -442,6 +442,7 @@ install2.test \ installdir.test \ instsh.test \ instsh2.test \ +instsh3.test \ instdat.test \ instdat2.test \ instexec.test \ diff --git a/tests/instsh2.test b/tests/instsh2.test index 17b61aba1..f0b729e94 100755 --- a/tests/instsh2.test +++ b/tests/instsh2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004, 2006, 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 @@ -77,20 +77,6 @@ test -f d3/y ./install-sh -T x d3 && exit 1 ./install-sh -T x d4// && exit 1 -# Do not change the timestamps when using -C. -echo foo >file -./install-sh -C file d1 -TZ=UTC0 touch -t $old_timestamp d1/file -./install-sh -C file d1 -is_newest file d1/file -echo foo1 >file -./install-sh -C file d1 -diff file d1/file -# Rights must be updated. -./install-sh -C -m 444 file d1 -test -r d1/file -test ! -w d1/file - # Ensure that install-sh works with names that include spaces touch 'a b' mkdir 'x y' diff --git a/tests/instsh3.test b/tests/instsh3.test new file mode 100755 index 000000000..95b74c728 --- /dev/null +++ b/tests/instsh3.test @@ -0,0 +1,37 @@ +#! /bin/sh +# Copyright (C) 2006, 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, 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 . + +# More install-sh checks: check -C. + +required=non-root +. ./defs || exit 1 +set -e + +./install-sh -d d1 + +# Do not change the timestamps when using -C. +echo foo >file +./install-sh -C file d1 +TZ=UTC0 touch -t $old_timestamp d1/file +./install-sh -C file d1 +is_newest file d1/file +echo foo1 >file +./install-sh -C file d1 +diff file d1/file +# Rights must be updated. +./install-sh -C -m 444 file d1 +test -r d1/file +test ! -w d1/file -- 2.47.2