changeset 30420:40fc92b47433

Set and use EXEEXT.
author Simon Josefsson <simon@josefsson.org>
date Mon, 27 Oct 2008 13:51:04 +0100
parents 4f0b228d7203
children d55c1075e654
files ChangeLog gnulib-tool tests/test-argp-2.sh
diffstat 3 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 27 12:40:45 2008 +0100
+++ b/ChangeLog	Mon Oct 27 13:51:04 2008 +0100
@@ -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.
--- a/gnulib-tool	Mon Oct 27 12:40:45 2008 +0100
+++ b/gnulib-tool	Mon Oct 27 13:51:04 2008 +0100
@@ -2012,7 +2012,7 @@
   #   "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 ="
--- a/tests/test-argp-2.sh	Mon Oct 27 12:40:45 2008 +0100
+++ b/tests/test-argp-2.sh	Mon Oct 27 13:51:04 2008 +0100
@@ -39,7 +39,7 @@
             [--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 @@
 [--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 @@
 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