--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -636,17 +636,17 @@ PLATFORM_UNITTEST_VARS = {
'product_name': 'firefox',
'app_name': 'browser',
'brand_name': 'Minefield',
'builds_before_reboot': 1,
'unittest-env': {'DISPLAY': ':0'},
'enable_opt_unittests': True,
'enable_debug_unittests': True,
'ubuntu32_vm': {
- 'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:] + REFTEST_IPC + REFTEST_NOACCEL,
+ 'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:] + REFTEST_NOACCEL,
'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
'suite_config': {
'mochitest': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
@@ -777,22 +777,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/linux_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/linux_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -867,22 +861,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/linux_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/linux_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -954,22 +942,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/linux_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/linux_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/linux_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/linux_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -1049,22 +1031,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-omtc': {
'config_files': ["unittests/win_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/win_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/win_unittest.py"],
},
'marionette': {
'config_files': ["marionette/windows_config.py"],
@@ -1136,22 +1112,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-omtc': {
'config_files': ["unittests/win_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/win_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/win_unittest.py"],
},
'marionette': {
'config_files': ["marionette/windows_config.py"],
@@ -1223,22 +1193,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-omtc': {
'config_files': ["unittests/win_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/win_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/win_unittest.py"],
},
'marionette': {
'config_files': ["marionette/windows_config.py"],
@@ -1318,22 +1282,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/win_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/win_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/win_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/win_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/win_unittest.py"],
},
'marionette': {
'config_files': ["marionette/windows_config.py"],
@@ -1407,22 +1365,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/mac_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/mac_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -1488,22 +1440,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/mac_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/mac_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -1569,22 +1515,16 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'crashtest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'reftest-no-accel': {
'config_files': ["unittests/mac_unittest.py"],
},
- 'reftest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
- 'crashtest-ipc': {
- 'config_files': ["unittests/mac_unittest.py"],
- },
'xpcshell': {
'config_files': ["unittests/mac_unittest.py"],
},
'cppunit': {
'config_files': ["unittests/mac_unittest.py"],
},
'marionette': {
'config_files': ["marionette/prod_config.py"],
@@ -1948,16 +1888,26 @@ for platform in PLATFORMS.keys():
if platform not in ['linux', 'linux64']:
continue
for name, branch in items_at_least(BRANCHES, 'gecko_version', 32):
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if platform in BRANCHES[name]['platforms']:
if slave_platform in BRANCHES[name]['platforms'][platform]:
BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += MARIONETTE[:]
+# reftest-ipc and crashtest-ipc on linux opt disabled on gecko > 36
+for platform in PLATFORMS.keys():
+ if platform not in ['linux']:
+ continue
+ for name, branch in items_before(BRANCHES, 'gecko_version', 36):
+ for slave_platform in PLATFORMS[platform]['slave_platforms']:
+ if platform in BRANCHES[name]['platforms']:
+ if slave_platform in BRANCHES[name]['platforms'][platform]:
+ BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += REFTEST_IPC
+
# Enable jittests on trunk trees https://bugzilla.mozilla.org/show_bug.cgi?id=973900
for platform in PLATFORMS.keys():
# run in chunks on linux only
if platform in ['linux', 'linux64', 'linux64-asan', 'linux64-cc']:
jittests = JITTEST_CHUNKED
else:
jittests = JITTEST