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 961BF26F64 for ; Mon, 6 Aug 2018 07:30:33 -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 pAmOW968v_AU for ; Mon, 6 Aug 2018 07:30:33 -0400 (EDT) Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (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 5461122755 for ; Mon, 6 Aug 2018 07:30:33 -0400 (EDT) Received: from [194.186.63.136] (port=59110 helo=localhost.localdomain) by smtp57.i.mail.ru with esmtpa (envelope-from ) id 1fmdiZ-0001OT-3X for tarantool-patches@freelists.org; Mon, 06 Aug 2018 14:30:31 +0300 From: Sergei Voronezhskii Subject: [tarantool-patches] [PATCH] test: Switch CI test-run to one job Date: Mon, 6 Aug 2018 14:30:27 +0300 Message-Id: <20180806113027.28473-1-sergw@tarantool.org> In-Reply-To: <20180805210218.2dvoy5nimote6dzy@tkn_work_nb> References: <20180805210218.2dvoy5nimote6dzy@tkn_work_nb> 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: tarantool-patches@freelists.org 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