[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-4-gf609f82

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f609f8298556d73e1331a5e404248c44f31ee7e2

The branch, branch-1-10 has been updated
       via  f609f8298556d73e1331a5e404248c44f31ee7e2 (commit)
      from  0722293f2ed401ad8e23bcf987d44e228843298a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f609f8298556d73e1331a5e404248c44f31ee7e2
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 30 21:23:16 2008 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |    8 +++++++
 THANKS                            |    1 +
 tests/Makefile.am                 |    1 +
 tests/Makefile.in                 |    1 +
 tests/instsh2.test                |   16 +-------------
 tests/{man3.test => instsh3.test} |   41 +++++++++++++++---------------------
 6 files changed, 29 insertions(+), 39 deletions(-)
 copy tests/{man3.test => instsh3.test} (59%)

diff --git a/ChangeLog b/ChangeLog
index 537eff4..59e6e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-30  Ralf Wildenhues  <address@hidden>
+
+       * 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  <address@hidden>
 
        * tests/lisp3.test: Fix typo.
diff --git a/THANKS b/THANKS
index abebd5f..c2ec6a5 100644
--- a/THANKS
+++ b/THANKS
@@ -290,6 +290,7 @@ Tamara L. Dahlgren  address@hidden
 Tatu Ylonen            address@hidden
 Teun Burgers           address@hidden
 The Crimson Binome     address@hidden
+Theodoros V. Kalamatianos address@hidden
 Thien-Thi Nguyen       address@hidden
 Thomas Fitzsimmons     address@hidden
 Thomas Gagne           address@hidden
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bb89110..9db9bb3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -284,6 +284,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 2ae1852..72372b8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -416,6 +416,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 88f1985..4fe15a6 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 file is part of GNU Automake.
 #
@@ -81,20 +81,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/man3.test b/tests/instsh3.test
similarity index 59%
copy from tests/man3.test
copy to tests/instsh3.test
index 2527e9c..95b74c7 100755
--- a/tests/man3.test
+++ b/tests/instsh3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# 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
@@ -14,31 +14,24 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
+# More install-sh checks: check -C.
 
+required=non-root
 . ./defs || exit 1
-
 set -e
 
-cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
-END
-
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
-AC_OUTPUT
-END
-
-cat > foo.1.in <<'END'
address@hidden@
-END
+./install-sh -d d1
 
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-./configure
-$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS=foo=bar
+# 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


hooks/post-receive
--
GNU Automake