From c41e25bb2396935162b091e2b9978edbe10ed269 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 10 Oct 2019 17:54:13 -0400
Subject: [PATCH 1/3] Enable WPT in Linux taskcluster CI.

---
 etc/taskcluster/decision_task.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 4ef0a73f9bf7..ec4a5d5df1cc 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -22,9 +22,6 @@ def main(task_for):
         # This local variable shadows the module-level function of the same name.
         android_x86_wpt = android_x86_release
 
-        # Implemented but disabled for now:
-        linux_wpt = lambda: None  # Shadows the existing top-level function
-
         all_tests = [
             linux_tidy_unit_docs,
             windows_unit,
@@ -100,7 +97,6 @@ def main(task_for):
 def mocked_only():
     windows_release()
     android_x86_wpt()
-    linux_wpt()
     decisionlib.DockerWorkerTask("Indexed by task definition").find_or_create()
 
 

From 6d74dd06309164ef8efe63571dafc6fb325e0601 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 10 Oct 2019 17:54:32 -0400
Subject: [PATCH 2/3] tmp: repurpose try-arm

---
 etc/taskcluster/decision_task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index ec4a5d5df1cc..94d17fb290a9 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -54,7 +54,7 @@ def main(task_for):
             "try-linux": [linux_tidy_unit_docs, linux_release],
             "try-windows": [windows_unit, windows_arm64, windows_uwp_x64],
             "try-magicleap": [magicleap_dev],
-            "try-arm": [windows_arm64],
+            "try-arm": [linux_wpt],
             "try-wpt": [linux_wpt],
             "try-wpt-mac": [macos_wpt],
             "try-wpt-android": [android_x86_wpt],

From 2f959ca033a6a3e5699f0b64ded925972092fe06 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 10 Oct 2019 18:26:24 -0400
Subject: [PATCH 3/3] fixup! Enable WPT in Linux taskcluster CI.

---
 etc/taskcluster/decision_task.py        | 17 ++++++++++++-----
 etc/taskcluster/docker/base.dockerfile  |  3 +++
 etc/taskcluster/docker/build.dockerfile |  1 -
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 94d17fb290a9..739a16cd27db 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -112,13 +112,16 @@ def mocked_only():
 }
 unix_build_env = {
 }
+# Setting up a virtualenv for mach can require compiling native python modules.
+linux_env = {
+    "CC": "clang",
+    "CXX": "clang++",
+}
 linux_build_env = {
     "SHELL": "/bin/dash",  # For SpiderMonkey’s build system
     "CCACHE": "sccache",
     "RUSTC_WRAPPER": "sccache",
     "SCCACHE_IDLE_TIMEOUT": "1200",
-    "CC": "clang",
-    "CXX": "clang++",
 }
 macos_build_env = {}
 windows_build_env = {
@@ -151,7 +154,7 @@ def linux_tidy_unit_untrusted():
         .with_treeherder("Linux x64", "Tidy+Unit")
         .with_max_run_time_minutes(60)
         .with_dockerfile(dockerfile_path("build"))
-        .with_env(**build_env, **unix_build_env, **linux_build_env)
+        .with_env(**build_env, **unix_build_env, **linux_env, **linux_build_env)
         .with_repo()
         .with_script("""
             ./mach test-tidy --no-progress --all
@@ -521,7 +524,11 @@ def linux_wpt():
         .find_or_create("build.linux_x64_release~assertions" + CONFIG.task_id())
     )
     def linux_run_task(name):
-        return linux_task(name).with_dockerfile(dockerfile_path("run"))
+        return (
+            linux_task(name)
+            .with_env(**linux_env)
+            .with_dockerfile(dockerfile_path("run"))
+        )
     wpt_chunks("Linux x64", linux_run_task, release_build_task, repo_dir="/repo",
                total_chunks=2, processes=24)
 
@@ -758,7 +765,7 @@ def linux_build_task(name, *, build_env=build_env):
         .with_index_and_artifacts_expire_in(build_artifacts_expire_in)
         .with_max_run_time_minutes(60)
         .with_dockerfile(dockerfile_path("build"))
-        .with_env(**build_env, **unix_build_env, **linux_build_env)
+        .with_env(**build_env, **unix_build_env, **linux_env, **linux_build_env)
         .with_repo()
     )
 
diff --git a/etc/taskcluster/docker/base.dockerfile b/etc/taskcluster/docker/base.dockerfile
index c4ce68399528..dd26573a4f42 100644
--- a/etc/taskcluster/docker/base.dockerfile
+++ b/etc/taskcluster/docker/base.dockerfile
@@ -19,6 +19,9 @@ RUN \
         python-pip \
         python-dev \
         #
+        # Building native python dependencies
+        clang \
+        #
         # Installing rustup and sccache (build dockerfile) or fetching build artifacts (run tasks)
         curl && \
     # Running mach
diff --git a/etc/taskcluster/docker/build.dockerfile b/etc/taskcluster/docker/build.dockerfile
index 8466a08da90c..f6068bfc8c08 100644
--- a/etc/taskcluster/docker/build.dockerfile
+++ b/etc/taskcluster/docker/build.dockerfile
@@ -18,7 +18,6 @@ RUN \
         autoconf2.13 \
         #
         # Bindgen (for SpiderMonkey bindings)
-        clang \
         llvm \
         llvm-dev \
         #