diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2013-10-30 17:47:45 +1300 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2014-01-02 12:06:30 +1300 |
| commit | 0e1ba2182cbbae47d5da09984c776774ab2616ea (patch) | |
| tree | 96e3ba4d2e8d516f3112dff8881ce913971315a5 | |
| parent | 747c60634e269ecf740254d86f4a4a2500c20524 (diff) | |
| download | libtool-0e1ba2182cbbae47d5da09984c776774ab2616ea.tar.gz | |
tests: use TESTS_ENVIRONMENT for EGREP and FGREP.
Be consistent about passing commands to the testsuite, and use
TESTS_ENVIRONMENT consistent.
* Makefile.am (TESTS_ENVIRONMENT): Add EGREP and FGREP.
* tests/testsuite.at: Remove EGREP and FGREP extractions from
generated libtool script.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | tests/testsuite.at | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c59fe304..a210a750 100644 --- a/Makefile.am +++ b/Makefile.am @@ -691,7 +691,8 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \ LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \ AR="$(AR)" \ - GREP="$(GREP)" SED="$(SED)" STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \ + EGREP="$(EGREP)" FGREP="$(FGREP)" GREP="$(GREP)" SED="$(SED)" \ + STRIP="$(STRIP)" lt_INSTALL="$(INSTALL)" \ MANIFEST_TOOL="$(MANIFEST_TOOL)" \ OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \ SHELL="$(SHELL)" CONFIG_SHELL="$(SHELL)" \ diff --git a/tests/testsuite.at b/tests/testsuite.at index 835f2535..2215eb3a 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -35,8 +35,7 @@ for tool in ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF; do if eval \$$tool --version >/dev/null 2>&1; then :; else eval $tool=no; fi done export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF -eval `$LIBTOOL --config | $GREP '^EGREP='` -eval `$LIBTOOL --config | $EGREP '^(FGREP|objdir|objext)'` +eval `$LIBTOOL --config | $EGREP '^(objdir|objext)'` eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|build_alias|to_host_file_cmd|to_tool_file_cmd)='` configure_options=--prefix=/nonexistent if test -n "$host_alias"; then |