automake 1.7.2 & DJGPP: tests: test -f and executable

[Richard Dawe]

Hello.

Some of the tests look for executables using test -f. Under DJGPP the tests
have an executable extension of .exe, so test -f won't find them in the tests
as they're currently coded.

Below is a ChangeLog and patch to make configure substitute EXEEXT, store
EXEEXT in tests/defs and use it in the tests with the problems.

Please CC me on any replies, because I'm not subscribed to bug-automake.

Thanks, regards,

-- 
Richard Dawe [ http://www.phekda.freeserve.co.uk/richdawe/ ]

2003-01-10  Richard Dawe  <address@hidden>

        *  configure.in: Use AC_PROG_CC, to get the executable extension.

        *  tests/defs.in: Substitute EXEEXT too.

        *  tests/gnits2.test: Use ${EXEEXT} when testing for existence
        of executables.
        *  tests/pr300-prog.test: Likewise.
        *  tests/transform.test: Likewise.

--- /dev/c/develop/ports/orig/automake-1.7.2/configure.in       2002-12-05
20:24:36.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/automake-1.7.2/configure.in    2003-01-08
13:54:26.000000000 +0000
@@ -93,6 +93,10 @@ AC_MSG_RESULT([$result])
 AC_PROG_EGREP
 AC_PROG_FGREP
 
+# Find the compiler and hence the extension of executables produced by it.
+# The test suite needs the executable extension.
+AC_PROG_CC
+
 AC_CONFIG_FILES([
   Makefile
   lib/Automake/Makefile
--- /dev/c/develop/ports/orig/automake-1.7.2/tests/defs.in      2002-11-21
13:24:24.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/automake-1.7.2/tests/defs.in   2003-01-08
13:55:00.000000000 +0000
@@ -244,6 +244,10 @@ export AUTOMAKE ACLOCAL
 EGREP='@EGREP@'
 FGREP='@FGREP@'
 
+# We need to check for existence of executables and hence need
+# the executable extension.
+EXEEXT='@EXEEXT@'
+
 # The tests call `make -e' but we do not want $srcdir from the evironment
 # to override the definition from the Makefile.
 testsrcdir=$srcdir
--- /dev/c/develop/ports/orig/automake-1.7.2/tests/gnits2.test  2002-11-30
20:30:04.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/automake-1.7.2/tests/gnits2.test 2003-01-08
13:56:04.000000000 +0000
@@ -97,8 +97,8 @@ cd build
 ../configure --prefix=`pwd`/../inst-dir --program-prefix=p
 $MAKE all
 $MAKE install
-test -f ../inst-dir/bin/pfine
-test ! -f ../inst-dir/bin/fine
+test -f ../inst-dir/bin/pfine${EXEEXT}
+test ! -f ../inst-dir/bin/fine${EXEEXT}
 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
 cat stderr
 $MAKE grep-stderr
--- /dev/c/develop/ports/orig/automake-1.7.2/tests/pr300-prog.test 2002-09-08
13:07:54.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/automake-1.7.2/tests/pr300-prog.test
2003-01-08 13:57:06.000000000 +0000
@@ -57,20 +57,20 @@ $AUTOMAKE --copy --add-missing
 ./configure --prefix `pwd`/inst
 $MAKE
 
-test -f subdir/wish
-test -f subdir/want
+test -f subdir/wish${EXEEXT}
+test -f subdir/want${EXEEXT}
 
 $MAKE install
 
-test -f inst/bin/wish
-test -f inst/bin/subdir/want
+test -f inst/bin/wish${EXEEXT}
+test -f inst/bin/subdir/want${EXEEXT}
 
 $MAKE uninstall
 
-test -f inst/bin/wish && exit 1
-test -f inst/bin/subdir/want && exit 1
+test -f inst/bin/wish${EXEEXT} && exit 1
+test -f inst/bin/subdir/want${EXEEXT} && exit 1
 
 $MAKE install-strip
 
-test -f inst/bin/wish
-test -f inst/bin/subdir/want
+test -f inst/bin/wish${EXEEXT}
+test -f inst/bin/subdir/want${EXEEXT}
--- /dev/c/develop/ports/orig/automake-1.7.2/tests/transform.test 2002-09-08
13:07:56.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/automake-1.7.2/tests/transform.test
2003-01-08 13:57:22.000000000 +0000
@@ -54,7 +54,7 @@ $AUTOMAKE
 ./configure --program-prefix=gnu- --prefix `pwd`/inst
 $MAKE
 $MAKE install
-test -f inst/bin/gnu-h
+test -f inst/bin/gnu-h${EXEEXT}
 test -f inst/bin/gnu-h.sh
 test -f inst/man/man1/gnu-h.1
 $MAKE uninstall