[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1d-14
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1d-144-g563ecad |
|
Date: |
Wed, 15 May 2013 20:39:03 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=563ecade28bb4ec0f285019959267015af5725b3
The branch, maint has been updated
via 563ecade28bb4ec0f285019959267015af5725b3 (commit)
via 7810a65de4899ef3c6489fb30cc2458c24c25ca8 (commit)
via c6b827b2f82ed40a3ddee2f1e986e186cacffb67 (commit)
via cce6192b67e6e66a39dd4ee002bf3b8919cbf30b (commit)
via 6653939c0d4c551502bb4b74cf4ae9c7441a9436 (commit)
via e142bcb0e2f29ff444195c5ea934b834dc63d048 (commit)
from c148dc73a92c1df5e70a61e9495e62c010090bd4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 563ecade28bb4ec0f285019959267015af5725b3
Author: Stefano Lattarini <address@hidden>
Date: Wed May 15 15:55:44 2013 +0200
THANKS: update Akim's e-mail address
Signed-off-by: Stefano Lattarini <address@hidden>
commit 7810a65de4899ef3c6489fb30cc2458c24c25ca8
Author: Stefano Lattarini <address@hidden>
Date: Tue May 14 15:50:12 2013 +0200
tests: less uses of "make -e"; avoid spurious failures in 'check-cc-no-c-o'
That is, when the testsuite is run using a fake C compiler that doesn't
grasp the '-c' and '-o' options together.
* t/instdir-prog.sh: Adjust.
* t/instdir-ltlib.sh: Likewise.
* t/python-virtualenv.sh: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
commit c6b827b2f82ed40a3ddee2f1e986e186cacffb67
Author: Stefano Lattarini <address@hidden>
Date: Tue May 14 14:18:00 2013 +0200
build: be more respectful of user-specified verbosity
* t/Makefile.in (check-cc-no-c-o, check-no-trailing-backslash-in-recipes,
installcheck-testsuite, perf): Here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit cce6192b67e6e66a39dd4ee002bf3b8919cbf30b
Author: Stefano Lattarini <address@hidden>
Date: Tue May 14 13:40:48 2013 +0200
check-cc-no-c-o: unify initializations in a single place
* t/ax/test-defs.in: That is, by setting CC and GNU_CC here, in accord
with the value of the variable 'AM_TESTSUITE_SIMULATING_NO_CC_C_O'.
* t/Makefile.in (check-cc-no-c-o) : No need to reset CC and GNU_CC any
longer in the recursive "make check" invocation.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 6653939c0d4c551502bb4b74cf4ae9c7441a9436
Author: Stefano Lattarini <address@hidden>
Date: Tue May 14 13:17:50 2013 +0200
check-cc-no-c-o: avoid a spurious failure
* t/am-prog-cc-c-o.sh: In this test, by relying on the knowledge
that we are running under the aegis of the 'check-cc-no-c-o'
maintainer-specific target, knowledge given us by ...
* t/Makefile.in (check-cc-no-c-o) : ... the new environment
variable 'AM_TESTSUITE_SIMULATING_NO_CC_C_O', set to a value
of "yes" by this rule.
* t/ax/test-defs.in: Initialize the new variable to "no" by
default, and add an explanatory comment.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
THANKS | 2 +-
bin/Makefile.inc | 1 +
t/Makefile.inc | 14 +++++++-------
t/am-prog-cc-c-o.sh | 6 +++++-
t/ax/test-defs.in | 16 +++++++++++++++-
t/instdir-ltlib.sh | 23 ++++++++++++++++-------
t/instdir-prog.sh | 22 +++++++++++++++-------
t/python-virtualenv.sh | 9 ++++-----
8 files changed, 64 insertions(+), 29 deletions(-)
diff --git a/THANKS b/THANKS
index fe7a7de..853c379 100644
--- a/THANKS
+++ b/THANKS
@@ -6,7 +6,7 @@ Adam J. Richter address@hidden
Adam Mercer address@hidden
Adam Sampson address@hidden
Adrian Bunk address@hidden
-Akim Demaille address@hidden
+Akim Demaille address@hidden
Alan Modra address@hidden
Alex Hornby address@hidden
Alex Unleashed address@hidden
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 280fff0..5842b71 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -56,6 +56,7 @@ uninstall-hook:
%D%/aclocal: %D%/aclocal.in
%D%/automake %D%/aclocal: Makefile %D%/gen-perl-protos
$(AM_V_GEN)rm -f $@ address@hidden address@hidden \
+ && $(MKDIR_P) $(@D) \
## Common substitutions.
&& address@hidden && $(do_subst) <$(srcdir)/$$in >address@hidden \
## Auto-compute prototypes of perl subroutines.
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 18a57c2..f979c66 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -224,7 +224,7 @@ check-local: check-tests-syntax
# that helps catching such problems in Automake-generated recipes.
# See automake bug#10436.
check-no-trailing-backslash-in-recipes:
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash'
.PHONY: check-no-trailing-backslash-in-recipes
@@ -234,9 +234,8 @@ check-no-trailing-backslash-in-recipes:
# otherwise only present themselves later "in the wild". See also the
# long discussion about automake bug#13378.
check-cc-no-c-o:
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
- CC='$(abs_top_builddir)/%D%/ax/cc-no-c-o' \
- GNU_CC='$(abs_top_builddir)/%D%/ax/cc-no-c-o'
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes
.PHONY: check-cc-no-c-o
## Checking the list of tests.
@@ -246,13 +245,14 @@ include %D%/CheckListOfTests.am
# Run the testsuite with the installed aclocal and automake.
installcheck-local: installcheck-testsuite
installcheck-testsuite:
- am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ am_running_installcheck=yes
# Performance tests.
.PHONY: perf
perf: all
- $(MAKE) $(AM_MAKEFLAGS) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' \
- TESTS='$(perf_TESTS)' check
+ $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+ TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)' TESTS='$(perf_TESTS)'
PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log
CLEANFILES += $(PERF_TEST_SUITE_LOG)
EXTRA_DIST += $(perf_TESTS)
diff --git a/t/am-prog-cc-c-o.sh b/t/am-prog-cc-c-o.sh
index 549cdcc..920a0dc 100755
--- a/t/am-prog-cc-c-o.sh
+++ b/t/am-prog-cc-c-o.sh
@@ -56,7 +56,11 @@ $AUTOMAKE --add-missing
./configure >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP 'understands? -c and -o together.* yes$' stdout
+if test "$AM_TESTSUITE_SIMULATING_NO_CC_C_O" != no; then
+ $EGREP 'understands? -c and -o together.* no$' stdout
+else
+ $EGREP 'understands? -c and -o together.* yes$' stdout
+fi
# No repeated checks please.
test $(grep -c ".*-c['\" ].*-o['\" ]" stdout) -eq 1
$MAKE
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index 1083743..9662c79 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -76,6 +76,11 @@ PATH_SEPARATOR='@PATH_SEPARATOR@'
host_alias=${host_alias-'@host_alias@'}; export host_alias
build_alias=${build_alias-'@build_alias@'}; export build_alias
+# Whether the testsuite is being run by faking the presence of a C
+# compiler that doesn't grasp the '-c' and '-o' flags together. By
+# default, of course, it isn't.
+: "${AM_TESTSUITE_SIMULATING_NO_CC_C_O:=no}"
+
# A concurrency-safe "mkdir -p" implementation.
MKDIR_P=${AM_TESTSUITE_MKDIR_P-'@MKDIR_P@'}
@@ -136,7 +141,11 @@ FGREP=${AM_TESTSUITE_FGREP-'@FGREP@'}
# Compilers and their flags. These can point to non-GNU compilers (and
# on non-Linux and non-BSD systems, they probably will).
-CC=${AM_TESTSUITE_CC-${CC-'@CC@'}}
+if test $AM_TESTSUITE_SIMULATING_NO_CC_C_O = no; then
+ CC=${AM_TESTSUITE_CC-${CC-'@CC@'}}
+else
+ CC=$am_testaux_builddir/cc-no-c-o
+fi
CXX=${AM_TESTSUITE_CXX-${CXX-'@CXX@'}}
F77=${AM_TESTSUITE_F77-${F77-'@F77@'}}
FC=${AM_TESTSUITE_FC-${FC-'@FC@'}}
@@ -147,6 +156,11 @@ FFLAGS=${AM_TESTSUITE_FFLAGS-${FFLAGS-'@FFLAGS@'}}
CPPFLAGS=${AM_TESTSUITE_CPPFLAGS-${CPPFLAGS-'@CPPFLAGS@'}}
# GNU compilers and their flags.
+if test $AM_TESTSUITE_SIMULATING_NO_CC_C_O = no; then
+ GNU_CC=${AM_TESTSUITE_GNU_CC-${GNU_CC-'@GNU_CC@'}}
+else
+ GNU_CC=$am_testaux_builddir/cc-no-c-o
+fi
GNU_CC=${AM_TESTSUITE_GNU_CC-${GNU_CC-'@GNU_CC@'}}
GNU_CXX=${AM_TESTSUITE_GNU_CXX-${GNU_CXX-'@GNU_CXX@'}}
GNU_F77=${AM_TESTSUITE_GNU_F77-${GNU_F77-'@GNU_F77@'}}
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 726f809..273206c 100755
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -66,22 +66,31 @@ cd build
../configure --prefix="$instdir" PYTHON="echo" \
am_cv_python_pythondir="$instdir/python" \
am_cv_python_pyexecdir="$instdir/pyexec"
-$MAKE
+xMAKE ()
+{
+ # Early line break here to please maintainer-check.
+ $MAKE \
+ bindir= libdir= pyexecdir= \
+ AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \
+ "$@"
+}
+
+xMAKE
-bindir= libdir= pyexecdir=
-export bindir libdir pyexecdir
-$MAKE -e install
+xMAKE install
test ! -e "$instdir"
-$MAKE -e install DESTDIR="$destdir"
+xMAKE install DESTDIR="$destdir"
test ! -e "$instdir"
test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
+xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && exit 1
+$MAKE
+
:
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index f916a11..f2b96b8 100755
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -65,20 +65,28 @@ cd build
../configure --prefix="$instdir" PYTHON="echo" \
am_cv_python_pythondir="$instdir/python" \
am_cv_python_pyexecdir="$instdir/pyexec"
-$MAKE
-bindir= libdir= pyexecdir=
-export bindir libdir pyexecdir
-$MAKE -e install
+xMAKE ()
+{
+ # Early line break here to please maintainer-check.
+ $MAKE \
+ bindir= libdir= pyexecdir= \
+ AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \
+ "$@"
+}
+
+xMAKE
+
+xMAKE install
test ! -e "$instdir"
-$MAKE -e install DESTDIR="$destdir"
+xMAKE install DESTDIR="$destdir"
test ! -e "$instdir"
test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
+xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
grep 'rm'' ' stdout && exit 1
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index a67e7c2..faf1d5a 100755
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -178,13 +178,12 @@ $MAKE distclean
# Overriding pythondir and pyexecdir at make time should be enough.
./configure --prefix="$cwd/bad-prefix"
-pythondir=$py_site pyexecdir=$py_site
-export pythondir pyexecdir
-check_install -e
+check_install pythondir="$py_site" pyexecdir="$py_site" \
+ AM_MAKEFLAGS="pythondir='$py_site' pyexecdir='$py_site'"
test ! -e bad-prefix
$MAKE test-run
-check_uninstall -e
-unset pythondir pyexecdir
+check_uninstall pythondir="$py_site" pyexecdir="$py_site" \
+ AM_MAKEFLAGS="pythondir='$py_site' pyexecdir='$py_site'"
# Also check that the distribution is self-contained, for completeness.
$MAKE distcheck
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13.1d-144-g563ecad,
Stefano Lattarini <=