[SCM] GNU Autoconf source repository branch, master, updated. v2.65-15-g81074ea

[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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=81074eaa201a289d11b6be05e0c78afbe5ff79f5

The branch, master has been updated
       via  81074eaa201a289d11b6be05e0c78afbe5ff79f5 (commit)
      from  3fbac862d74fcae50f2e49ac2298a856a441742c (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 81074eaa201a289d11b6be05e0c78afbe5ff79f5
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Dec 15 06:52:19 2009 +0100

    Add testsuite exposure for shtool usage.
    
    * tests/foreign.at (shtool): New test.
    Report by Dmitry Grebeniuk.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog        |    6 ++++++
 tests/foreign.at |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 205c535..64a499e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-15  Ralf Wildenhues  <address@hidden>
+
+       Add testsuite exposure for shtool usage.
+       * tests/foreign.at (shtool): New test.
+       Report by Dmitry Grebeniuk.
+
 2009-12-12  Eric Blake  <address@hidden>
 
        Improve wording about m4 quote characters.
diff --git a/tests/foreign.at b/tests/foreign.at
index 099a84f..feb280f 100644
--- a/tests/foreign.at
+++ b/tests/foreign.at
@@ -89,3 +89,54 @@ AT_CHECK_AUTOCONF([], [], [], [ignore])
 AT_CHECK_CONFIGURE([], [], [], [ignore])
 
 AT_CLEANUP
+
+
+AT_SETUP([shtool])
+
+AT_DATA([configure.ac],
+[[AC_INIT([shtool test], [1.0])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_PATH_PROG([SHTOOL], [shtool], [false])
+AC_PROG_INSTALL
+AC_SUBST([ac_install_sh])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+]])
+
+AT_DATA([Makefile.in],
+[[SHTOOL = @SHTOOL@
+# fake these, so that we use shtool whereever possible.
+INSTALL_PROGRAM = $(ac_install_sh)
+INSTALL_DATA = $(ac_install_sh) -m 644
+prefix = @prefix@
+ac_install_sh = @ac_install_sh@
+
+install:
+       $(INSTALL_PROGRAM) file1 $(prefix)/file1
+       $(INSTALL_DATA) file2 $(prefix)/file2
+
+copy-shtool:
+       test '$(SHTOOL)' != false
+       cp '$(SHTOOL)' build-aux
+]])
+
+: >file1
+: >file2
+chmod +x file1
+: ${MAKE=make}
+mkdir build-aux inst
+instdir=`pwd`/inst
+AT_CHECK_AUTOCONF
+cp "$abs_top_srcdir/build-aux/install-sh" build-aux
+AT_CHECK_CONFIGURE
+AT_CHECK([$MAKE copy-shtool], [], [ignore], [ignore],
+        [AT_CHECK([: >build-aux/shtool])])
+rm -f build-aux/install-sh
+AT_CHECK_CONFIGURE([--prefix="$instdir" ac_cv_path_SHTOOL=false])
+AT_CHECK([grep '^ac_install_sh = .*shtool install -c' Makefile], [], [ignore])
+if test -s build-aux/shtool; then
+  AT_CHECK([$MAKE install], [], [ignore], [ignore])
+  AT_CHECK([test -f inst/file1 && test -f inst/file2 && test -x inst/file1])
+fi
+
+AT_CLEANUP


hooks/post-receive
-- 
GNU Autoconf source repository