Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Unified Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 2430193003: WebRTC: Remove Dr Memory bots. (Closed)
Patch Set: Replace memory_tool with enable_memcheck. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipe_modules/webrtc/api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/config.py
diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py
index 2c340bf30bd89db9b20eefd0bc299180a3a28485..901bbea1215e4ea9ea9e947fbc86af7157481e25 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -19,7 +19,6 @@ HOST_ARCHS = ('intel',)
TARGET_ARCHS = HOST_ARCHS + ('arm', 'mips', 'mipsel')
TARGET_CROS_BOARDS = (None, 'x86-generic')
BUILD_CONFIGS = ('Release', 'Debug', 'Coverage')
-MEMORY_TOOLS = ('memcheck', 'drmemory_full', 'drmemory_light')
PROJECT_GENERATORS = ('gyp', 'gn', 'mb')
def check(val, potentials):
@@ -82,7 +81,7 @@ def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
args = List(basestring),
),
runtests = ConfigGroup(
- memory_tool = Single(basestring, required=False),
+ enable_memcheck = Single(bool, empty_val=False, required=False),
memory_tests_runner = Single(Path),
enable_lsan = Single(bool, empty_val=False, required=False),
test_args = List(basestring),
@@ -453,12 +452,12 @@ def ubsan_vptr(c):
def prebuilt_instrumented_libraries(c):
c.gyp_env.GYP_DEFINES['use_prebuilt_instrumented_libraries'] = 1
-@config_ctx(group='memory_tool')
+@config_ctx(group='enable_memcheck')
def memcheck(c):
kjellander_chromium 2016/10/19 15:41:23 I don't think a group makes sense anymore. Just re
ehmaldonado_chromium 2016/10/19 16:00:27 It does. It means that memcheck, tsan2 and syzyasa
- _memory_tool(c, 'memcheck')
+ c.runtests.enable_memcheck = True
c.gyp_env.GYP_DEFINES['build_for_tool'] = 'memcheck'
-@config_ctx(deps=['compiler'], group='memory_tool')
+@config_ctx(deps=['compiler'], group='enable_memcheck')
def tsan2(c):
if 'clang' not in c.compile_py.compiler: # pragma: no cover
raise BadConf('tsan2 requires clang')
@@ -475,7 +474,7 @@ def syzyasan_compile_only(c):
gyp_defs['win_z7'] = 0
@config_ctx(
- deps=['compiler'], group='memory_tool', includes=['syzyasan_compile_only'])
+ deps=['compiler'], group='enable_memcheck', includes=['syzyasan_compile_only'])
def syzyasan(c):
if c.gyp_env.GYP_DEFINES['component'] != 'static_library': # pragma: no cover
raise BadConf('SyzyASan requires component=static_library')
@@ -483,22 +482,6 @@ def syzyasan(c):
gyp_defs['win_z7'] = 1
gyp_defs['chromium_win_pch'] = 0
-@config_ctx(group='memory_tool')
-def drmemory_full(c):
- _memory_tool(c, 'drmemory_full')
- c.gyp_env.GYP_DEFINES['build_for_tool'] = 'drmemory'
-
-@config_ctx(group='memory_tool')
-def drmemory_light(c):
- _memory_tool(c, 'drmemory_light')
- c.gyp_env.GYP_DEFINES['build_for_tool'] = 'drmemory'
-
-def _memory_tool(c, tool):
- if tool not in MEMORY_TOOLS: # pragma: no cover
- raise BadConf('"%s" is not a supported memory tool, the supported ones '
- 'are: %s' % (tool, ','.join(MEMORY_TOOLS)))
- c.runtests.memory_tool = tool
-
@config_ctx()
def lto(c):
c.lto = True
« no previous file with comments | « scripts/slave/recipe_modules/chromium/api.py ('k') | scripts/slave/recipe_modules/webrtc/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698