Bug 1322845 - Enable reftests on macosx64-qr. r?Gankro
The change to tests.py is resurrecting code that was removed in
bug
1446954 but that we still want.
MozReview-Commit-ID: CaWJiOopj82
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -250,16 +250,25 @@ macosx64-nightly/opt:
- macosx64-talos-profiling
- awsy
macosx64-devedition/opt:
build-platform: macosx64-devedition-nightly/opt
test-sets:
- macosx64-tests
+macosx64-qr/opt:
+ build-platform: macosx64/opt
+ test-sets:
+ - macosx64-qr-tests
+macosx64-qr/debug:
+ build-platform: macosx64/debug
+ test-sets:
+ - macosx64-qr-tests
+
##
# Android platforms (matching /android.*/)
android-4.3-arm7-api-16/debug:
build-platform: android-api-16/debug
test-sets:
- android-common-tests
- android-debug-tests
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -301,16 +301,20 @@ macosx64-talos-profiling:
- talos-perf-reftest-singletons-profiling
- talos-speedometer-profiling
- talos-motionmark-profiling
- talos-svgr-profiling
- talos-tp5o-profiling
- talos-tp6-profiling
# - talos-tps-profiling # Bug 1453007 times out
+macosx64-qr-tests:
+ - reftest
+ - reftest-fonts
+
linux32-tests:
- cppunit
- crashtest
- firefox-ui-functional-local
- firefox-ui-functional-remote
- gtest
- jittest
- jsreftest
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -537,18 +537,28 @@ def set_treeherder_machine_platform(conf
# The build names for Android platforms have partially evolved over the
# years and need to be translated.
'android-api-16/debug': 'android-4-3-armv7-api16/debug',
'android-api-16/opt': 'android-4-3-armv7-api16/opt',
'android-x86/opt': 'android-4-2-x86/opt',
'android-api-16-gradle/opt': 'android-api-16-gradle/opt',
}
for test in tests:
- test['treeherder-machine-platform'] = translation.get(
- test['build-platform'], test['test-platform'])
+ # For most desktop platforms, the above table is not used for "regular"
+ # builds, so we'll always pick the test platform here.
+ # On macOS though, the regular builds are in the table. This causes a
+ # conflict in `verify_task_graph_symbol` once you add a new test
+ # platform based on regular macOS builds, such as for QR.
+ # Since it's unclear if the regular macOS builds can be removed from
+ # the table, workaround the issue for QR.
+ if '-qr' in test['test-platform']:
+ test['treeherder-machine-platform'] = test['test-platform']
+ else:
+ test['treeherder-machine-platform'] = translation.get(
+ test['build-platform'], test['test-platform'])
yield test
@transforms.add
def set_tier(config, tests):
"""Set the tier based on policy for all test descriptions that do not
specify a tier otherwise."""
for test in tests: