diff --git a/.travis.yml b/.travis.yml index d2a05ba476..3a57c00eb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ script: - if [ $SECONDS -gt 1200 ]; then export DEPENDS_TIMEOUT="true"; false; fi # The "false" here ensures that the build is marked as failed even though the whole script returns 0 - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh - - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh + - test "$DEPENDS_TIMEOUT" != "true" && $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh -parallel=3 - test "$DEPENDS_TIMEOUT" != "true" && if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi after_script: - echo $TRAVIS_COMMIT_RANGE diff --git a/ci/test_integrationtests.sh b/ci/test_integrationtests.sh index 2223a98c89..7b35739619 100755 --- a/ci/test_integrationtests.sh +++ b/ci/test_integrationtests.sh @@ -4,6 +4,8 @@ set -e +PASS_ARGS="$@" + source ./ci/matrix.sh if [ "$RUN_TESTS" != "true" ]; then @@ -15,4 +17,4 @@ export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib cd build-ci/dashcore-$BUILD_TARGET -./qa/pull-tester/rpc-tests.py --coverage +./qa/pull-tester/rpc-tests.py --coverage $PASS_ARGS