From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 A7B7A440F3C for ; Wed, 6 Nov 2019 15:57:24 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Wed, 6 Nov 2019 15:57:19 +0300 Message-Id: <5222788db1b9a73d0ab69bd23067437ecf52ded6.1573044108.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v1 2/3] test: need to run all test suites on OSX 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 Enabled complete testing for OSX, temporary skipped the failed suite replication/ and tests engine/replica_join with issue #4370 and small/quota from repository https://github.com/tarantool/small.git with issue #4357 to enable it back. Also fixed the OSX ulimit setup different for VBOX and Travis-ci images. Closes #4358 (cherry picked from commit 73319ae8bfcdabda01277d085150ad08c21b7c6d) --- .travis.mk | 22 ++++++++++++++++------ test/engine/replica_join.skipcond | 7 +++++++ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 test/engine/replica_join.skipcond diff --git a/.travis.mk b/.travis.mk index bfb3016da..e5112ef30 100644 --- a/.travis.mk +++ b/.travis.mk @@ -4,6 +4,7 @@ DOCKER_IMAGE?=packpack/packpack:debian-stretch TEST_RUN_EXTRA_PARAMS?= +MAX_FILES?=65534 all: package @@ -115,12 +116,21 @@ build_osx: test_osx_no_deps: build_osx # Increase the maximum number of open file descriptors on macOS - sudo sysctl -w kern.maxfiles=20480 || : - sudo sysctl -w kern.maxfilesperproc=20480 || : - sudo launchctl limit maxfiles 20480 || : - ulimit -S -n 20480 || : - ulimit -n - cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) unit/ app/ app-tap/ box/ box-tap/ + 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/ test_osx: deps_osx test_osx_no_deps diff --git a/test/engine/replica_join.skipcond b/test/engine/replica_join.skipcond new file mode 100644 index 000000000..56f938312 --- /dev/null +++ b/test/engine/replica_join.skipcond @@ -0,0 +1,7 @@ +import platform + +# Disabled on OSX due to fail #4370. +if platform.system() == 'Darwin': + self.skip = 1 + +# vim: set ft=python: -- 2.17.1