<HTML><BODY>LGTM<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Среда, 22 января 2020, 10:28 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br>
<br>
<div>
<div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<div id="style_15796781320405436467_BODY">Added homebrew installation routine as it was suggested in its<br>
instructions. Added installation of the cmake tool. Added upgrade<br>
of the OSX packages to avoid of fails on already existed packages<br>
with the previous versions.<br>
<br>
Added reinstallation of the python2 with force option to be able<br>
to install it to /usr/local/ path to make pip install there too.<br>
---<br>
.travis.mk | 30 +++++++++++++++++++++---------<br>
1 file changed, 21 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/.travis.mk b/.travis.mk<br>
index 42969ff56..60bbf3c1b 100644<br>
--- a/.travis.mk<br>
+++ b/.travis.mk<br>
@@ -127,16 +127,27 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps<br>
# OSX #<br>
#######<br>
<br>
+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake python2<br>
+<br>
deps_osx:<br>
- brew update<br>
- brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force<br>
- python2 -V || brew install python2 --force<br>
- curl --silent --show-error --retry 5 <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py<br>
- python get-pip.py --user<br>
- pip install --user --force-reinstall -r test-run/requirements.txt<br>
+ # install brew using command from Homebrew repository instructions:<br>
+ # <a href="https://github.com/Homebrew/install" target="_blank">https://github.com/Homebrew/install</a><br>
+ # NOTE: 'echo' command below is required since brew installation<br>
+ # script obliges the one to enter a newline for confirming the<br>
+ # installation via Ruby script.<br>
+ brew update || echo | /usr/bin/ruby -e \<br>
+ "$$(curl -fsSL <a href="https://raw.githubusercontent.com/Homebrew/install/master/install" target="_blank">https://raw.githubusercontent.com/Homebrew/install/master/install</a>)"<br>
+ # try to install the packages either upgrade it to avoid of fails<br>
+ # if the package already exists with the previous version<br>
+ brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS} <br>
+ curl --silent --show-error --retry 5 \<br>
+ <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py<br>
+ python get-pip.py<br>
+ pip install --force-reinstall -r test-run/requirements.txt<br>
<br>
build_osx:<br>
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}<br>
+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \<br>
+ -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \<br>
make -j<br>
<br>
test_osx_no_deps: build_osx<br>
@@ -153,8 +164,9 @@ test_osx_no_deps: build_osx<br>
ulimit -n ${MAX_FILES} || : ; \<br>
ulimit -n ; \<br>
cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \<br>
- app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \<br>
- replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/<br>
+ app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ \<br>
+ long_run-py/ luajit-tap/ replication-py/ small/ sql/ \<br>
+ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/<br>
<br>
test_osx: deps_osx test_osx_no_deps<br>
<br>
-- <br>
2.17.1<br>
<br>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<br>-- <br>Oleg Piskunov<br></BODY></HTML>