Index: scripts/slave/recipe_modules/webrtc/api.py |
diff --git a/scripts/slave/recipe_modules/webrtc/api.py b/scripts/slave/recipe_modules/webrtc/api.py |
index 155568a70249b1876cf35fd6c0a8a5d58d86f178..b2f3f8dae3229740ad78aeb274d5fe91564e8378 100644 |
--- a/scripts/slave/recipe_modules/webrtc/api.py |
+++ b/scripts/slave/recipe_modules/webrtc/api.py |
@@ -321,13 +321,6 @@ class WebRTCApi(recipe_api.RecipeApi): |
annotate = None # The parallel script doesn't output gtest format. |
flakiness_dash = False |
- # TODO(kjellander): Disable deadlock detection for all TSan builders |
- # except the one in the client.webrtc.fyi waterfall. Remove when |
- # webrtc:4106 is fixed. |
- if ('with deadlock detection' not in self.m.properties.get('buildername') |
- and self.m.chromium.c.gyp_env.GYP_DEFINES.get('tsan') == 1): |
- env['TSAN_OPTIONS'] = 'detect_deadlocks=0' |
- |
self.m.chromium.runtest( |
test=test, args=args, name=name, annotate=annotate, xvfb=True, |
flakiness_dash=flakiness_dash, python_mode=python_mode, |