Bug 1370636 - [wdspec] Enable Wd jobs on Windows platforms. r=jgraham
authorHenrik Skupin <mail@hskupin.info>
Tue, 02 Oct 2018 13:34:02 +0000
changeset 494913 b9a19eb6f805500a3f9a80b44f2337f8d7d777e7
parent 494912 9e11b103f7ec94a03c55f0fc7ddd4eeaafde284e
child 494914 b79da889f39bb028073d6b2b0bf042a05cb42c52
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgraham
bugs1370636
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1370636 - [wdspec] Enable Wd jobs on Windows platforms. r=jgraham Depends on D7418 Differential Revision: https://phabricator.services.mozilla.com/D7419
taskcluster/ci/test/test-sets.yml
testing/mozharness/configs/web_platform_tests/prod_config.py
testing/mozharness/configs/web_platform_tests/prod_config_windows.py
testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -207,16 +207,17 @@ windows-tests:
     - mochitest-webgl2-ext
     - reftest
     - reftest-no-accel
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
     - web-platform-tests
     - web-platform-tests-reftests
+    - web-platform-tests-wdspec
     - xpcshell
 
 windows-talos:
     - talos-bcv
     - talos-chrome
     - talos-damp
     - talos-dromaeojs
     - talos-g1
--- a/testing/mozharness/configs/web_platform_tests/prod_config.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config.py
@@ -1,24 +1,27 @@
 # ***** BEGIN LICENSE BLOCK *****
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
 
+import os
+
+
 config = {
     "options": [
         "--prefs-root=%(test_path)s/prefs",
         "--processes=1",
         "--config=%(test_path)s/wptrunner.ini",
         "--ca-cert-path=%(test_path)s/tests/tools/certs/cacert.pem",
         "--host-key-path=%(test_path)s/tests/tools/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/tests/tools/certs/web-platform.test.pem",
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
     "download_minidump_stackwalk": True,
 
     # this would normally be in "exes", but "exes" is clobbered by remove_executables
-    "geckodriver": "%(test_install_path)s/bin/geckodriver",
+    "geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver"),
 
     "per_test_category": "web-platform",
 }
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
@@ -1,18 +1,20 @@
 # ***** BEGIN LICENSE BLOCK *****
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
 
 # This is a template config file for web-platform-tests test.
 
+import os
 import sys
 
+
 config = {
     "options": [
         "--prefs-root=%(test_path)s/prefs",
         "--processes=1",
         "--config=%(test_path)s/wptrunner.ini",
         "--ca-cert-path=%(test_path)s/tests/tools/certs/cacert.pem",
         "--host-key-path=%(test_path)s/tests/tools/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/tests/tools/certs/web-platform.test.pem",
@@ -22,12 +24,12 @@ config = {
     "exes": {
         'python': sys.executable,
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
     "download_minidump_stackwalk": True,
 
     # this would normally be in "exes", but "exes" is clobbered by remove_executables
-    "geckodriver": "%(test_install_path)s/bin/geckodriver",
+    "geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver.exe"),
 
     "per_test_category": "web-platform",
 }
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@@ -4,16 +4,17 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
 
 # This is a template config file for web-platform-tests test.
 
 import os
 import sys
 
+
 config = {
     "options": [
         "--prefs-root=%(test_path)s/prefs",
         "--processes=1",
         "--config=%(test_path)s/wptrunner.ini",
         "--ca-cert-path=%(test_path)s/tests/tools/certs/cacert.pem",
         "--host-key-path=%(test_path)s/tests/tools/certs/web-platform.test.key",
         "--host-cert-path=%(test_path)s/tests/tools/certs/web-platform.test.pem",
@@ -48,12 +49,12 @@ config = {
             'halt_on_failure': True,
             'enabled': True
         }
     ],
 
     "download_minidump_stackwalk": True,
 
     # this would normally be in "exes", but "exes" is clobbered by remove_executables
-    "geckodriver": "%(test_install_path)s/bin/geckodriver",
+    "geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver.exe"),
 
     "per_test_category": "web-platform",
 }