diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-26 14:09:20 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-26 14:09:20 +0200 |
commit | 3f19ee5f2e2b7cef7f77893a280e2261bc5f711f (patch) | |
tree | 0fb0505dffca279021ad906a17415bdfda8baf4a /t | |
parent | d6efe326c1e3a09de1c9c997c6a0b6353ceb1ce0 (diff) | |
parent | 2ea48f45055ca574b8b63eff83c42e3f06d5b08c (diff) | |
download | automake-3f19ee5f2e2b7cef7f77893a280e2261bc5f711f.tar.gz |
Merge branch 'micro' into maint
* micro:
tests: adjust or remove some obsolete comments
tests: remove some useless 'unset' of variables
Diffstat (limited to 't')
-rw-r--r-- | t/ax/am-test-lib.sh | 8 | ||||
-rw-r--r-- | t/distcheck-configure-flags.sh | 1 | ||||
-rw-r--r-- | t/javaflags.sh | 4 | ||||
-rw-r--r-- | t/lflags.sh | 4 | ||||
-rw-r--r-- | t/lflags2.sh | 4 |
5 files changed, 3 insertions, 18 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh index 1fbc73138..91f8b457b 100644 --- a/t/ax/am-test-lib.sh +++ b/t/ax/am-test-lib.sh @@ -43,18 +43,16 @@ unset __MKLVL__ MAKE_JOBS_FIFO # For BSD make. unset DMAKE_CHILD DMAKE_DEF_PRINTED DMAKE_MAX_JOBS # For Solaris dmake. # Unset verbosity flag. unset V -# Also unset variables that will let "make -e install" divert -# files into unwanted directories. +# Also unset variables that might influence "make install". unset DESTDIR unset prefix exec_prefix bindir datarootdir datadir docdir dvidir unset htmldir includedir infodir libdir libexecdir localedir mandir unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir -# Unset variables that might change the "make distcheck" behaviour. +# Unset variables that might influcence "make distcheck". unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS # Used by install rules for info files. unset AM_UPDATE_INFO_DIR -# The tests call "make -e" but we do not want $srcdir from the environment -# to override the definition from the Makefile. +# We don't want to use the $srcdir value exported by the test driver. unset srcdir # Also unset variables that control our test driver. While not # conceptually independent, they cause some changed semantics we diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh index 3674e03a9..15adf4700 100644 --- a/t/distcheck-configure-flags.sh +++ b/t/distcheck-configure-flags.sh @@ -40,7 +40,6 @@ $AUTOCONF # It should be ok to define DISTCHECK_CONFIGURE_FLAGS either on the # make command line or in the environment. -# Not 'make -e' below, deliberately. env DISTCHECK_CONFIGURE_FLAGS='--enable-success sentence=it\ works\ :-\)' \ $MAKE distcheck diff --git a/t/javaflags.sh b/t/javaflags.sh index ec405d656..2f434b274 100644 --- a/t/javaflags.sh +++ b/t/javaflags.sh @@ -24,10 +24,6 @@ echo "$*" > javaflags.list END chmod a+x fake-javac -# Remove JAVAC from the environment, so that it won't interfere -# with 'make -e' below. -unset JAVAC - cat >> configure.ac <<'END' AC_PROG_CC # Simulate presence of the java compiler using our fake-javac script. diff --git a/t/lflags.sh b/t/lflags.sh index ce6ccc8de..a7a59270a 100644 --- a/t/lflags.sh +++ b/t/lflags.sh @@ -29,10 +29,6 @@ echo 'extern int dummy;' >> lex.yy.c END chmod a+x fake-lex -# Remove Lex from the environment, so that it won't interfere -# with 'make -e' below. -unset LEX - cat >> configure.ac <<'END' AC_SUBST([CC], [false]) # Simulate presence of Lex using our fake-lex script. diff --git a/t/lflags2.sh b/t/lflags2.sh index d21afad4d..bcc42c767 100644 --- a/t/lflags2.sh +++ b/t/lflags2.sh @@ -28,10 +28,6 @@ echo 'extern int dummy;' >> lex.yy.c END chmod a+x fake-lex -# Remove Lex from the environment, so that it won't interfere -# with 'make -e' below. -unset LEX - cat >> configure.ac <<'END' AC_SUBST([CXX], [false]) # Simulate presence of Lex using our fake-lex script. |