On Monday 17 October 2011, Stefano Lattarini wrote:
> Keeping the `testsuite-work' and `test-protocols' branches separate is
> becoming more and more confusing and unwiedly, and since the final aim
> is to merge them both into master (someday before the 1.12 release), I
> think it would be acceptable to simply merge them together at this point
> (i.e., merge the latest `test-protocols' into `testsuite-work', and then
> simply remove `test-protocols'). I will proceed to do so in 72 hours if
> there is no objection.
>
Merged and pushed:
Merge branch 'test-protocols' into testsuite-work
* test-protocols:
cosmetics: remove obsolete comment
coverage: conditional contents in LOG_DRIVER variables
coverage: LOG_DRIVER variables can be defined through AC_SUBST
tests: fix spurious failure with Solaris /bin/sh
threaded-am: better serialization for required config files
automake: refactor, break up 'require_file_internal'
dist: separate auxiliary file instantiation from DIST_COMMON update
refactor: rename a subroutine to a more proper name
dist: truly always distribute files in AC_REQUIRE_AUX_FILE
dist: simplify automake code accordingly to the previous changes
dist: auxiliary files can be distributed from subdir Makefiles
Deleted and pushed:
To ssh://<HIDDEN>/automake.git
- [deleted] test-protocols
Regards,
Stefano
