Set and use EXEEXT.

diff --git a/ChangeLog b/ChangeLog
index f1d6f78847ab3f3f1ff115f187950b066481d6d7..026dc3b77dadcb771236909cbb2535228ccfd477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-27  Simon Josefsson  <simon@josefsson.org>
+
+       * gnulib-tool (func_emit_tests_Makefile_am): Set EXEEXT in
+       TESTS_ENVIRONMENT, for shell scripts that needs to call built
+       programs.
+       * tests/test-argp-2.sh: Use $EXEEXT when needed.
+
 2008-10-27  Simon Josefsson  <simon@josefsson.org>
 
        * lib/sys_stat.in.h (lstat): Fix declaration for mingw.

diff --git a/gnulib-tool b/gnulib-tool
index b0f4c1884e2fdd0b54a434248f801373effaf95b..c6d9dc152c173a1f2737f0b2d81e85f9f3f35243 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2012,7 +2012,7 @@ func_emit_tests_Makefile_am ()
   #   "AM_GNU_GETTEXT used but SUBDIRS not defined"
   echo "SUBDIRS ="
   echo "TESTS ="
-  echo "TESTS_ENVIRONMENT ="
+  echo "TESTS_ENVIRONMENT = EXEEXT=\$(EXEEXT)"
   echo "noinst_PROGRAMS ="
   if ! $for_test; then
     echo "check_PROGRAMS ="

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index a3c2fe55e13b5215a86c47a22f0648967593076c..39132bc4c8103a18d372cf8d53877c89f28e417c 100755 (executable)
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -39,7 +39,7 @@ Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
             [--version] ARGS...
 EOT
 
-./test-argp --usage | func_compare || ERR=1
+./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test working usage-indent format
@@ -50,7 +50,7 @@ Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
 [--limerick] [--poem] [--help] [--usage] [--version] ARGS...
 EOT
 
-ARGP_HELP_FMT='usage-indent=0' ./test-argp --usage | func_compare || ERR=1
+ARGP_HELP_FMT='usage-indent=0' ./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test --help output
@@ -93,16 +93,16 @@ for any corresponding short options.
 Report bugs to <>.
 EOT
 
-./test-argp --help | func_compare || ERR=1
+./test-argp$EXEEXT --help | func_compare || ERR=1
 
 ####
 # Test ambiguous option handling
 
-./test-argp --optio 2>/dev/null && ERR=1
+./test-argp$EXEEXT --optio 2>/dev/null && ERR=1
 
 ####
 # Run built-in tests
-./test-argp || ERR=1
+./test-argp$EXEEXT || ERR=1
 
 rm $TMP