From: Richard Levitte <levitte@openssl.org>
Date: Fri, 9 Feb 2018 08:12:47 +0000 (+0100)
Subject: Revert ".travis.yml: remove osx from build matrix."
X-Git-Tag: OpenSSL_1_1_1-pre1~29
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=a6da6b73ca480cfa6fe8d0a882f4ff549d46fcff

Revert ".travis.yml: remove osx from build matrix."

Recent changes seem to have gotten OS X back on track, so we should be
able to run our tests there again.

This reverts commit e12e903e9ac675d08f9dd0db1f0c1a2049232c21.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5292)
---

diff --git a/.travis.yml b/.travis.yml
index cfc11b6851..0586fb3e51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ addons:
 
 os:
     - linux
+    - osx
 
 compiler:
     - clang