tor-browser

commit 1059f054014944000e39e9f05293a72f951ddb11
parent 2cacd6b77836fdf766ba6779c134387a69f3513c
Author: Greg Stoll <gstoll@mozilla.com>
Date:   Thu, 30 Oct 2025 14:57:16 +0000

Bug 1906827 part 3 - make cppunittests run on AArch64 r=ci-and-tooling,taskgraph-reviewers,jmaher,yjuglaret

Windows on AArch64 is a tier 1 target, and we'd like to run more (i.e.
some) tests there. I don't know if there's a plan to run everything on
AArch64, but this is an easy way to get some coverage, and as the bug
mentions some of these tests have been failing for a while on AArch64.

Differential Revision: https://phabricator.services.mozilla.com/D269397

Diffstat:
M
taskcluster/gecko_taskgraph/transforms/test/worker.py
 | 
3
+++
M
taskcluster/kinds/build/windows.yml
 | 
2
++
M
taskcluster/test_configs/test-platforms.yml
 | 
11
+++++++++++
M
taskcluster/test_configs/test-sets.yml
 | 
3
+++
M
testing/cppunittest.toml
 | 
9
+++++----

5 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/transforms/test/worker.py b/taskcluster/gecko_taskgraph/transforms/test/worker.py
@@ -90,6 +90,9 @@ WINDOWS_WORKER_TYPES = {
         "virtual": "win11-64-24h2",
         "virtual-with-gpu": "win11-64-24h2-gpu",
     },
+    "windows11-aarch64-24h2": {
+        "virtual": "win11-a64-24h2",
+    },
 }
 
 # os x worker types keyed by test-platform
diff --git a/taskcluster/kinds/build/windows.yml b/taskcluster/kinds/build/windows.yml
@@ -1450,6 +1450,7 @@ win64-aarch64/debug:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: aarch64
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -1502,6 +1503,7 @@ win64-aarch64/opt:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: aarch64
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
diff --git a/taskcluster/test_configs/test-platforms.yml b/taskcluster/test_configs/test-platforms.yml
@@ -295,6 +295,17 @@ windows11-64-24h2-nightlyasrelease/opt:
     test-sets:
         - browsertime
 
+# windows11-64-aarch64
+windows11-aarch64-24h2/opt:
+    build-platform: win64-aarch64/opt
+    test-sets:
+        - windows-aarch64-tests
+
+windows11-aarch64-24h2/debug:
+    build-platform: win64-aarch64/debug
+    test-sets:
+        - windows-aarch64-tests
+
 ##
 # MacOS X platforms (matching /macosx.*/)
 
diff --git a/taskcluster/test_configs/test-sets.yml b/taskcluster/test_configs/test-sets.yml
@@ -296,6 +296,9 @@ windows32-tests:
     - web-platform-tests
     - web-platform-tests-crashtest
 
+windows-aarch64-tests:
+    - cppunittest
+
 windows10-2009-tests:
     - cppunittest
     - gtest
diff --git a/testing/cppunittest.toml b/testing/cppunittest.toml
@@ -4,6 +4,9 @@
 
 ["TestAlgorithm"]
 
+["TestArm64Disassembler"]
+run-if = ["os == 'win' && processor == 'aarch64'"]
+
 ["TestArray"]
 
 ["TestArrayUtils"]
@@ -47,10 +50,7 @@ run-if = ["os == 'win'"]
 run-if = ["os == 'win'"]
 
 ["TestDllInterceptorCrossProcess"]
-run-if = [
-  "os == 'win' && processor == 'x86'",
-  "os == 'win' && processor == 'x86_64'",
-]
+run-if = ["os == 'win' && processor != 'aarch64'"]
 
 ["TestDoublyLinkedList"]
 
@@ -75,6 +75,7 @@ run-if = [
 ["TestIATPatcher"]
 run-if = ["os == 'win'"]
 skip-if = [
+  "processor == 'aarch64'", # requires administrator permission on aarch64
   "win11_2009 && bits == 32", # fails on windows10x32
   "os == 'win' && os_version == '11.26100' && processor == 'x86'", # fails on win/x86
 ]