From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 11 May 2016 21:40:25 +0000 (+0300)
Subject: Merge branch 'travis-ci-os-matrix-v2'
X-Git-Tag: release-2.1.6-beta~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41e54464b93408dfb3f3a28396040db80ba131db;p=libevent

Merge branch 'travis-ci-os-matrix-v2'

This increases libevent coverage to:
- os:osx

- cmake -DEVENT__DISABLE_MM_REPLACEMENT=ON
- cmake -DEVENT__ENABLE_VERBOSE_DEBUG=ON
- configure --disable-openssl
- configure --disable-thread-support
- configure --disable-malloc-replacement

- fix travis-ci builds under automake >1.11

Possible failures after this patch set (not always, IOW in some builds this
issues aren't real issues):
- some failures but mostly because of timing issues, must be fixed separately.
- https://travis-ci.org/azat/libevent/jobs/129430229 # on brew update
- https://travis-ci.org/azat/libevent/jobs/129430221 # some locking issues

* travis-ci-os-matrix-v2:
  automake: define serial-tests only if automake have this option
  test/automake: don't use paralell test harness (since automake 1.12)
  travis-ci/osx: relink gcc/g++ instead of clang
  travis-ci: enable multi-os mode (osx, linux)
  travis-ci: increase matrix (--disable-foo)
  travis-ci: adjust alignment

Fixes: #356
Travis-CI: https://travis-ci.org/azat/libevent/builds/129430181
---

41e54464b93408dfb3f3a28396040db80ba131db