Skip to content
Snippets Groups Projects
Commit 8451e87c authored by Craig Tiller's avatar Craig Tiller
Browse files

Extend timeouts for Travis 2x

parent f6901be8
No related branches found
No related tags found
No related merge requests found
...@@ -4,11 +4,11 @@ before_install: ...@@ -4,11 +4,11 @@ before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv
script: script:
- ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg -s 2.0
- ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg -s 2.0
- make clean - make clean
- ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt -s 2.0
- ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c opt - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c opt -s 2.0
- ./tools/run_tests/run_tests.py -l node -t -j 16 -c opt - ./tools/run_tests/run_tests.py -l node -t -j 16 -c opt
notifications: notifications:
email: false email: false
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
#include <grpc/support/port_platform.h> #include <grpc/support/port_platform.h>
#include <grpc/support/log.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
...@@ -52,6 +53,9 @@ void grpc_test_init(int argc, char **argv) { ...@@ -52,6 +53,9 @@ void grpc_test_init(int argc, char **argv) {
/* disable SIGPIPE */ /* disable SIGPIPE */
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f",
GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, GRPC_TEST_SLOWDOWN_BUILD_FACTOR,
GRPC_TEST_SLOWDOWN_FACTOR);
/* seed rng with pid, so we don't end up with the same random numbers as a /* seed rng with pid, so we don't end up with the same random numbers as a
concurrently running test binary */ concurrently running test binary */
srand(seed()); srand(seed());
......
...@@ -171,6 +171,7 @@ argp.add_argument('-c', '--config', ...@@ -171,6 +171,7 @@ argp.add_argument('-c', '--config',
argp.add_argument('-n', '--runs_per_test', default=1, type=int) argp.add_argument('-n', '--runs_per_test', default=1, type=int)
argp.add_argument('-r', '--regex', default='.*', type=str) argp.add_argument('-r', '--regex', default='.*', type=str)
argp.add_argument('-j', '--jobs', default=1000, type=int) argp.add_argument('-j', '--jobs', default=1000, type=int)
argp.add_argument('-s', '--slowdown', default=1.0, type=float)
argp.add_argument('-f', '--forever', argp.add_argument('-f', '--forever',
default=False, default=False,
action='store_const', action='store_const',
...@@ -200,6 +201,7 @@ make_targets = [] ...@@ -200,6 +201,7 @@ make_targets = []
languages = set(_LANGUAGES[l] for l in args.language) languages = set(_LANGUAGES[l] for l in args.language)
build_steps = [jobset.JobSpec(['make', build_steps = [jobset.JobSpec(['make',
'-j', '%d' % (multiprocessing.cpu_count() + 1), '-j', '%d' % (multiprocessing.cpu_count() + 1),
'DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown,
'CONFIG=%s' % cfg] + list(set( 'CONFIG=%s' % cfg] + list(set(
itertools.chain.from_iterable( itertools.chain.from_iterable(
l.make_targets() for l in languages)))) l.make_targets() for l in languages))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment