From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 8CD0745256A for ; Wed, 6 Nov 2019 14:38:31 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Wed, 6 Nov 2019 14:37:31 +0300 Message-Id: <5de4187263364ae8cd0f6026e68380128d9a51cd.1573039651.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v1 3/3] travis-ci: fix OSX max files limits List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kirill Yukhin Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org Increased the maximum number of open file descriptors on macOS. Travis-ci: needed the "ulimit -n " call, because found that the tests fail without it even with launchctl limit tool set. Gitlab-ci: needed the "launchctl limit maxfiles " call, because under gitlib-ci it is needed the password to change the limits and we call the sudo tool which separates the local set of the environment. Closes #4373 (cherry picked from commit 027fa1a0699dc3b72d2f613bc32ba098c84938cf) --- .travis.mk | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.travis.mk b/.travis.mk index e5112ef30..98600bae2 100644 --- a/.travis.mk +++ b/.travis.mk @@ -115,22 +115,21 @@ build_osx: make -j test_osx_no_deps: build_osx - # Increase the maximum number of open file descriptors on macOS - echo tarantool | sudo -S echo "Initialize sudo for the next commands..." : - sudo sysctl -w kern.maxfiles=${MAX_FILES} || echo tarantool | sudo -S sysctl -w kern.maxfiles=${MAX_FILES} || : - sysctl -w kern.maxfiles || : - sudo sysctl -w kern.maxfilesperproc=${MAX_FILES} || echo tarantool | sudo -S sysctl -w kern.maxfilesperproc=${MAX_FILES} || : - sysctl -w kern.maxfilesperproc || : - sudo launchctl limit maxfiles ${MAX_FILES} || echo tarantool | sudo -S launchctl limit maxfiles ${MAX_FILES} || : - launchctl limit maxfiles || : - sudo ulimit -S -n ${MAX_FILES} || echo tarantool | sudo -S ulimit -S -n ${MAX_FILES} || : - ulimit -S -n || : - sudo ulimit -H -n ${MAX_FILES} || echo tarantool | sudo -S ulimit -H -n ${MAX_FILES} || : - ulimit -H -n - # temporary excluded replication/ suite with some tests from other suites by issues #4357 and #4370 - cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \ - app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \ - replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/ + # Limits: Increase the maximum number of open file descriptors on macOS: + # Travis-ci needs the "ulimit -n " call + # Gitlab-ci needs the "launchctl limit maxfiles " call + # Also gitlib-ci needs the password to change the limits, while + # travis-ci runs under root user. Limit setup must be in the same + # call as tests runs call. + # Tests: Temporary excluded replication/ suite with some tests + # from other suites by issues #4357 and #4370 + echo tarantool | sudo -S launchctl limit maxfiles ${MAX_FILES} || : ; \ + launchctl limit maxfiles || : ; \ + ulimit -n ${MAX_FILES} || : ; \ + ulimit -n ; \ + cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \ + app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \ + replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/ test_osx: deps_osx test_osx_no_deps -- 2.17.1