[tarantool-patches] [PATCH] Switch CI test-run to one job

[Sergei Voronezhskii <sergw@tarantool.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
---
 .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