diff options
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 07570262b2..c1de211d47 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -153,7 +153,9 @@ class CLanguage(object): else: binary = 'bins/%s/%s' % (config.build_config, target['name']) if os.path.isfile(binary): - out.append(config.job_spec([binary], [binary], + cmdline = [binary] + target['args'] + out.append(config.job_spec(cmdline, [binary], + shortname=' '.join(cmdline), environ={'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH': os.path.abspath(os.path.dirname( sys.argv[0]) + '/../../src/core/tsi/test_creds/ca.pem')})) @@ -438,7 +440,7 @@ class ObjCLanguage(object): class Sanity(object): def test_specs(self, config, args): - return [config.job_spec(['tools/run_tests/run_sanity.sh'], None), + return [config.job_spec(['tools/run_tests/run_sanity.sh'], None, timeout_seconds=15*60), config.job_spec(['tools/run_tests/check_sources_and_headers.py'], None)] def pre_build_steps(self): @@ -499,8 +501,8 @@ _CONFIGS = { 'msan': SimpleConfig('msan', timeout_multiplier=1.5), 'ubsan': SimpleConfig('ubsan'), 'asan': SimpleConfig('asan', timeout_multiplier=1.5, environ={ - 'ASAN_OPTIONS': 'detect_leaks=1:color=always', - 'LSAN_OPTIONS': 'report_objects=1'}), + 'ASAN_OPTIONS': 'suppressions=tools/asan_suppressions.txt:detect_leaks=1:color=always', + 'LSAN_OPTIONS': 'suppressions=tools/asan_suppressions.txt:report_objects=1'}), 'asan-noleaks': SimpleConfig('asan', environ={ 'ASAN_OPTIONS': 'detect_leaks=0:color=always'}), 'gcov': SimpleConfig('gcov'), |