diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-25 09:59:20 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-25 09:59:20 -0800 |
| commit | 194824467c8d014123a8a3cc8f4ad65b6f9a9b85 (patch) | |
| tree | 15d374907ebee9eed8be67025586517f53ba6f6f /tools | |
| parent | 5de79ee59f526f1eb0125d6544aaccdf5527afb4 (diff) | |
Get subchannel index working
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/distrib/check_copyright.py | 6 | ||||
| -rw-r--r-- | tools/lsan_suppressions.txt (renamed from tools/asan_suppressions.txt) | 0 | ||||
| -rw-r--r-- | tools/run_tests/configs.json | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 935acf525e..6123218c55 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -68,9 +68,9 @@ with open('LICENSE') as f: # that given a line of license text, returns what should # be in the file LICENSE_PREFIX = { - '.c': r'\s*\*\s*', - '.cc': r'\s*\*\s*', - '.h': r'\s*\*\s*', + '.c': r'\s*(//|\*)\s*', + '.cc': r'\s*(//|\*)\s*', + '.h': r'\s*(//|\*)\s*', '.m': r'\s*\*\s*', '.php': r'\s*\*\s*', '.js': r'\s*\*\s*', diff --git a/tools/asan_suppressions.txt b/tools/lsan_suppressions.txt index d672cb6cae..d672cb6cae 100644 --- a/tools/asan_suppressions.txt +++ b/tools/lsan_suppressions.txt diff --git a/tools/run_tests/configs.json b/tools/run_tests/configs.json index 769942df99..b21793d9cc 100644 --- a/tools/run_tests/configs.json +++ b/tools/run_tests/configs.json @@ -45,8 +45,8 @@ { "config": "asan", "environ": { - "ASAN_OPTIONS": "suppressions=tools/asan_suppressions.txt:detect_leaks=1:color=always", - "LSAN_OPTIONS": "suppressions=tools/asan_suppressions.txt:report_objects=1" + "ASAN_OPTIONS": "detect_leaks=1:color=always", + "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1" }, "timeout_multiplier": 1.5 }, |