[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
argp-tests: needs EXEEXT
From: |
Simon Josefsson |
Subject: |
argp-tests: needs EXEEXT |
Date: |
Mon, 27 Oct 2008 13:52:56 +0100 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/22.2 (gnu/linux) |
This patch fixes the argp failure in:
http://autobuild.josefsson.org/gnulib/log-200810270833778763000.txt
I have pushed it.
I have been using the same idiom in e.g. gnutls for scripts that needs
to invoke built programs. Are there any thoughts on better ways to
solve this problem?
/Simon
>From f27ea4d35597f50a19c1a5e8c123a31ee5233d40 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Mon, 27 Oct 2008 13:51:04 +0100
Subject: [PATCH] Set and use EXEEXT.
---
ChangeLog | 7 +++++++
gnulib-tool | 2 +-
tests/test-argp-2.sh | 10 +++++-----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f1d6f78..026dc3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-10-27 Simon Josefsson <address@hidden>
+ * 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 <address@hidden>
+
* lib/sys_stat.in.h (lstat): Fix declaration for mingw.
2008-10-27 Bruno Haible <address@hidden>
diff --git a/gnulib-tool b/gnulib-tool
index b0f4c18..c6d9dc1 100755
--- 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 a3c2fe5..39132bc 100755
--- 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
--
1.5.6.5
- argp-tests: needs EXEEXT,
Simon Josefsson <=