Bug 1417496 - Enable reftests for Windows coverage build, r=jlund
MozReview-Commit-ID: CHA95OZn50p
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -26,16 +26,17 @@ SlavePasswords = {
"win7_vm_devedition": "pass",
"win7_vm_gfx": "pass",
"win7_vm_gfx_devedition": "pass",
"win8": "pass",
"win8_64": "pass",
"win8_64_devedition": "pass",
"win10": "pass",
"win10_64": "pass",
+ "win10_64_ccov": "pass",
"win10_64_devedition": "pass",
"win10_64_stylo_disabled": "pass",
"win10_64_asan": "pass",
"w764": "pass",
"win64_vm": "pass",
}
blobber_username = 'user'
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -59,16 +59,17 @@ PLATFORMS = {
'linux64-devedition': {},
'macosx64': {},
'macosx64-devedition':{},
'win32': {},
'win32-devedition': {},
'win32-stylo-disabled': {},
'win64': {},
'win64-asan': {},
+ 'win64-ccov': {},
'win64-devedition':{},
'win64-stylo-disabled': {},
}
PLATFORMS['macosx64']['slave_platforms'] = ['yosemite_r7']
PLATFORMS['macosx64']['env_name'] = 'mac-perf'
PLATFORMS['macosx64']['yosemite_r7'] = {'name': "Rev7 MacOSX Yosemite 10.10.5"}
PLATFORMS['macosx64']['stage_product'] = 'firefox'
@@ -160,16 +161,28 @@ PLATFORMS['win64-asan']['win10_64_asan']
PLATFORMS['win64-asan']['stage_product'] = 'firefox'
PLATFORMS['win64-asan']['mozharness_config'] = {
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
'hg_bin': 'c:\\mozilla-build\\hg\\hg',
'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
'config_file': 'talos/windows_config.py',
}
+PLATFORMS['win64-ccov']['slave_platforms'] = ['win10_64_ccov']
+PLATFORMS['win64-ccov']['env_name'] = 'win64-perf'
+PLATFORMS['win64-ccov']['win10_64_ccov'] = {'name': 'Windows 10 64-bit Code Coverage',
+ 'try_by_default': False}
+PLATFORMS['win64-ccov']['stage_product'] = 'firefox'
+PLATFORMS['win64-ccov']['mozharness_config'] = {
+ 'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
+ 'hg_bin': 'c:\\mozilla-build\\hg\\hg',
+ 'reboot_command': ['c:/mozilla-build/python27/python', '-u'] + MOZHARNESS_REBOOT_CMD,
+ 'config_file': 'talos/windows_config.py',
+}
+
PLATFORMS['win64-stylo-disabled']['slave_platforms'] = ['win10_64_stylo_disabled']
PLATFORMS['win64-stylo-disabled']['talos_slave_platforms'] = []
PLATFORMS['win64-stylo-disabled']['env_name'] = 'win64-perf'
PLATFORMS['win64-stylo-disabled']['win10_64_stylo_disabled'] = {'name': 'Windows 10 64-bit stylo-disabled',
'try_by_default': False}
PLATFORMS['win64-stylo-disabled']['stage_product'] = 'firefox'
PLATFORMS['win64-stylo-disabled']['mozharness_config'] = {
'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
@@ -546,16 +559,17 @@ BRANCH_UNITTEST_VARS = {
'linux64-asan': {},
'macosx64': {},
'macosx64-devedition':{},
'win32': {},
'win32-devedition':{},
'win32-stylo-disabled': {},
'win64':{},
'win64-asan': {},
+ 'win64-ccov': {},
'win64-devedition': {},
'win64-stylo-disabled':{},
},
}
### The below section contains definitions for all of the test suites
### available for desktop testing.
@@ -2388,16 +2402,30 @@ PLATFORM_UNITTEST_VARS = {
'enable_opt_unittests': True,
'enable_debug_unittests': True,
'win10_64_asan': {
'opt_unittest_suites': [],
'debug_unittest_suites': [],
'suite_config': {},
},
},
+ 'win64-ccov': {
+ 'product_name': 'firefox',
+ 'app_name': 'browser',
+ 'brand_name': 'Minefield',
+ 'builds_before_reboot': 1,
+ 'env_name': 'win64-perf-unittest',
+ 'enable_opt_unittests': True,
+ 'enable_debug_unittests': True,
+ 'win10_64_ccov': {
+ 'opt_unittest_suites': [],
+ 'debug_unittest_suites': [],
+ 'suite_config': {},
+ },
+ },
'win64-devedition': {
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'builds_before_reboot': 1,
'mochitest_leak_threshold': 484,
'crashtest_leak_threshold': 484,
'env_name': 'win64-perf-unittest',
@@ -3493,16 +3521,29 @@ for name, branch in items_at_least(BRANC
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform not in branch['platforms'][platform]:
continue
tests = branch['platforms'][platform][slave_platform]
tests['opt_unittest_suites'] = [t for t in tests['opt_unittest_suites'] if t in opt]
tests['debug_unittest_suites'] = [t for t in tests['debug_unittest_suites'] if t in debug]
+# Bug 1417496 - Enable reftests for Windows coverage build
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 57):
+ for platform in branch['platforms']:
+ if platform not in PLATFORMS:
+ continue
+ if platform == 'win64-ccov':
+ if name not in ['mozilla-central', 'try']:
+ BRANCHES[name]['platforms'][platform] = {}
+ else:
+ BRANCHES[name]['platforms'][platform]['win10_64_ccov']['opt_unittest_suites'] = []
+ BRANCHES[name]['platforms'][platform]['win10_64_ccov']['debug_unittest_suites'] = REFTEST_E10S_TWO_CHUNKS + REFTEST_NOACCEL_E10S_TWO_CHUNKS
+
+
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -5,16 +5,17 @@ SLAVES = {
'win7_vm': {},
'win7_vm_devedition': {},
'win7_vm_gfx': {},
'win7_vm_gfx_devedition': {},
'win8': {},
'win8_64_devedition': {},
'win10': {},
'win10_64_asan': {},
+ 'win10_64_ccov': {},
'win10_64_devedition': {},
'yosemite_r7': {},
'yosemite_r7_devedition': {},
'ubuntu32_vm': {},
'ubuntu64_vm': {},
'ubuntu64_vm_large': {},
'ubuntu64_vm_lnx_large': {},
'ubuntu64-asan_vm_lnx_large': {},
@@ -66,16 +67,17 @@ for i in range(1, 90): #Bug 133739
for i in range(1, 3):
SLAVES['win64_vm']['tst-w64-ec2-%03i' % i] = {}
SLAVES['ubuntu64-asan_vm'] = SLAVES['ubuntu64_vm']
SLAVES['win8_64'] = SLAVES['win8']
SLAVES['win10_64'] = SLAVES['win10']
SLAVES['win10_64_asan'] = SLAVES['win10']
+SLAVES['win10_64_ccov'] = SLAVES['win10']
SLAVES['win10_64_devedition'] = SLAVES['win10']
SLAVES['win10_64_stylo_disabled'] = SLAVES['win10']
SLAVES['win7_ix_stylo_disabled'] = SLAVES['win7_ix']
SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm_armv7_mobile'] = SLAVES['ubuntu64_vm']
SLAVES['ubuntu64_vm_armv7_large'] = SLAVES['ubuntu64_vm_large']
SLAVES['ubuntu64_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
SLAVES['ubuntu64-asan_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']