--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -673,16 +673,26 @@ CRASHTEST_E10S = [
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--reftest-suite', 'crashtest', '--e10s'],
'blob_upload': True,
'script_maxtime': 7200,
}),
]
+JSREFTEST_E10S = [
+ ('jsreftest-e10s', {
+ 'use_mozharness': True,
+ 'script_path': 'scripts/desktop_unittest.py',
+ 'extra_args': ['--reftest-suite', 'jsreftest', '--e10s'],
+ 'blob_upload': True,
+ 'script_maxtime': 7200,
+ }),
+]
+
OTHER_REFTESTS = [
('jsreftest', {
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--reftest-suite', 'jsreftest'],
'blob_upload': True,
'script_maxtime': 7200,
}),
@@ -932,16 +942,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1049,16 +1062,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1168,16 +1184,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1283,16 +1302,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1398,16 +1420,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1520,16 +1545,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
@@ -1634,16 +1662,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
@@ -1748,16 +1779,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
@@ -1870,16 +1904,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
@@ -1972,16 +2009,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
@@ -2083,16 +2123,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/mac_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
@@ -2186,16 +2229,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/mac_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
@@ -2289,16 +2335,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'jsreftest': {
'config_files': ["unittests/mac_unittest.py"],
},
+ 'jsreftest-e10s': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
'crashtest': {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
@@ -2721,27 +2770,28 @@ for name, branch in items_at_least(BRANC
branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S
# Bug 1215233 - Enable more e10s tests on Windows 7 only
# Turn on mochitest-gl-e10s - bug 1221102
# Turn on mochitest-e10s-devtools-chrome - bug 1221499
# Turn on mochitest-e10s - bug 1232780
# Turn on reftest-e10s - bug 1239025
# Turn on crashtest-e10s - bug 1240825
+# Turn on jsreftest-e10s - bug 1246627
for name, branch in items_at_least(BRANCHES, 'gecko_version', trunk_gecko_version):
for platform in PLATFORMS.keys():
if platform not in branch['platforms']:
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform in branch['platforms'][platform] and slave_platform in ('win7-ix', 'win7-all'):
if name not in TWIGS:
branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
- MOCHITEST_WEBGL_E10S + MOCHITEST_DT_8_E10S + REFTEST_E10S + CRASHTEST_E10S
+ MOCHITEST_WEBGL_E10S + MOCHITEST_DT_8_E10S + REFTEST_E10S + CRASHTEST_E10S + JSREFTEST_E10S
branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
- MOCHITEST_WEBGL_E10S + MOCHITEST_DT_8_E10S + MOCHITEST_E10S + REFTEST_E10S + CRASHTEST_E10S
+ MOCHITEST_WEBGL_E10S + MOCHITEST_DT_8_E10S + MOCHITEST_E10S + REFTEST_E10S + CRASHTEST_E10S + JSREFTEST_E10S
# Bug 1200437
# Use 7 chunks for m-bc on branches > trunk, excluding twigs, 3 chunks elsewhere
# Bug 1203227
# Use 9 chunks for m-dt on branches > trunk, excluding twigs, 2 or 4 chunks elsewhere
for branch in BRANCHES.keys():
for platform in PLATFORMS.keys():
if platform not in BRANCHES[branch]['platforms']: