Merge branch 'testsuite-work' into master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 26 Dec 2011 21:49:22 +0000 (22:49 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 26 Dec 2011 21:49:22 +0000 (22:49 +0100)
commit6568eaae2dd2ca448fb2f499e2653d494f57c0a5
treed02830a60166bb106bee178b39fa528659d9f33c
parente3351076de09b744d3387699fa20f1ec85f9ba58
parenta3f66de9d0d0126dbefb08a69ea2a326fc6a6649
Merge branch 'testsuite-work' into master

At last!

Keeping the `master' and `testsuite-work' separated was becoming
quite artificial, since there is no way we are going to release
a 1.12 version of Automake that doesn't include the support for
the TAP test protocol and for user-defined test drivers -- which
are all implemented into the testsuite-work branch.

Moreover, keeping those two branches separated was causing more
maintenance and double-checking work than were warranted, was
making the automake git repository even more contorted, and, on
the top of all that, was actually *reducing coverage* by making
all the important changes in testsuite-work less visible (less
on-field testing by developers that routinely use bleeding edge
versions, less automated testing by services like Hydra/NixOS,
et cetera).