From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id A9C0F280FC for ; Tue, 7 Aug 2018 04:45:42 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4KrnA67aQsf for ; Tue, 7 Aug 2018 04:45:42 -0400 (EDT) Received: from smtp3.mail.ru (smtp3.mail.ru [94.100.179.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1BBA227D71 for ; Tue, 7 Aug 2018 04:45:42 -0400 (EDT) Date: Tue, 7 Aug 2018 11:45:40 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH] test: switch CI test-run to one job Message-ID: <20180807084525.y6wpurot4auiz7ag@tkn_work_nb> References: <20180806114619.evejvv64oxrv5cpm@tkn_work_nb> <20180806203039.7102-1-sergw@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180806203039.7102-1-sergw@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Sergei Voronezhskii Cc: tarantool-patches@freelists.org, Kirill Yukhin Hi! LGTM. CCed Kirill. WBR, Alexander Turenko. On Mon, Aug 06, 2018 at 11:30:39PM +0300, Sergei Voronezhskii wrote: > The -j -1 used to legacy consistent mode. Reducing the number of jobs > to one by switching to -j 1, uses same part of the code as in parallel > mode. The code in parallel mode kills hung tests. > > Part of https://github.com/tarantool/test-run/issues/106 > --- > branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job > build: https://travis-ci.org/tarantool/tarantool/builds/412547641 > .travis.mk | 6 +++--- > rpm/tarantool.spec | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.travis.mk b/.travis.mk > index 66c921aa7..23f804cde 100644 > --- a/.travis.mk > +++ b/.travis.mk > @@ -42,7 +42,7 @@ deps_ubuntu: > test_ubuntu: deps_ubuntu > cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo > make -j8 > - cd test && /usr/bin/python test-run.py -j -1 > + cd test && /usr/bin/python test-run.py -j 1 > > deps_osx: > brew update > @@ -62,14 +62,14 @@ test_osx: deps_osx > curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ > pip --version && \ > pip install -r test-run/requirements.txt && \ > - cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \ > + cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \ > deactivate > > coverage_ubuntu: deps_ubuntu > cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON > make -j8 > # Enable --long tests for coverage > - cd test && /usr/bin/python test-run.py -j -1 --long > + cd test && /usr/bin/python test-run.py -j 1 --long > lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp > lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \ > --output-file coverage.info > diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec > index 252e563fc..c87b1667d 100644 > --- a/rpm/tarantool.spec > +++ b/rpm/tarantool.spec > @@ -150,7 +150,7 @@ echo "self.skip = True" > ./test/app/socket.skipcond > # https://github.com/tarantool/tarantool/issues/1322 > echo "self.skip = True" > ./test/app/digest.skipcond > # run a safe subset of the test suite > -cd test && ./test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/ > +cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/ > %endif > > %pre > -- > 2.18.0 > >