From: Sergei Voronezhskii <sergw@tarantool.org>
To: tarantool-patches@freelists.org
Subject: [tarantool-patches] [PATCH] test: switch CI test-run to one job
Date: Mon, 6 Aug 2018 23:30:39 +0300 [thread overview]
Message-ID: <20180806203039.7102-1-sergw@tarantool.org> (raw)
In-Reply-To: <20180806114619.evejvv64oxrv5cpm@tkn_work_nb>
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
next prev parent reply other threads:[~2018-08-06 20:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-04 12:31 [tarantool-patches] [PATCH] Switch " Sergei Voronezhskii
2018-08-05 21:02 ` [tarantool-patches] " Alexander Turenko
2018-08-06 11:30 ` [tarantool-patches] [PATCH] test: " Sergei Voronezhskii
2018-08-06 11:46 ` [tarantool-patches] " Alexander Turenko
2018-08-06 20:30 ` Sergei Voronezhskii [this message]
2018-08-07 8:45 ` [tarantool-patches] Re: [PATCH] test: switch " Alexander Turenko
2018-08-07 17:43 ` Kirill Yukhin
2018-08-07 17:47 ` [tarantool-patches] Re: [PATCH] Switch " Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180806203039.7102-1-sergw@tarantool.org \
--to=sergw@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [tarantool-patches] [PATCH] test: switch CI test-run to one job' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox