Skip to content

Commit 1059f05

Browse files
gregstollagoloman@mozilla.com
authored andcommitted
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
1 parent 2cacd6b commit 1059f05

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

taskcluster/gecko_taskgraph/transforms/test/worker.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@
9090
"virtual": "win11-64-24h2",
9191
"virtual-with-gpu": "win11-64-24h2-gpu",
9292
},
93+
"windows11-aarch64-24h2": {
94+
"virtual": "win11-a64-24h2",
95+
},
9396
}
9497

9598
# os x worker types keyed by test-platform

taskcluster/kinds/build/windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,7 @@ win64-aarch64/debug:
14501450
max-run-time: 7200
14511451
env:
14521452
PERFHERDER_EXTRA_OPTIONS: aarch64
1453+
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
14531454
run:
14541455
actions: [get-secrets, build]
14551456
options: [append-env-variables-from-configs]
@@ -1502,6 +1503,7 @@ win64-aarch64/opt:
15021503
max-run-time: 7200
15031504
env:
15041505
PERFHERDER_EXTRA_OPTIONS: aarch64
1506+
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
15051507
run:
15061508
actions: [get-secrets, build]
15071509
options: [append-env-variables-from-configs]

taskcluster/test_configs/test-platforms.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,17 @@ windows11-64-24h2-nightlyasrelease/opt:
295295
test-sets:
296296
- browsertime
297297

298+
# windows11-64-aarch64
299+
windows11-aarch64-24h2/opt:
300+
build-platform: win64-aarch64/opt
301+
test-sets:
302+
- windows-aarch64-tests
303+
304+
windows11-aarch64-24h2/debug:
305+
build-platform: win64-aarch64/debug
306+
test-sets:
307+
- windows-aarch64-tests
308+
298309
##
299310
# MacOS X platforms (matching /macosx.*/)
300311

taskcluster/test_configs/test-sets.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@ windows32-tests:
296296
- web-platform-tests
297297
- web-platform-tests-crashtest
298298

299+
windows-aarch64-tests:
300+
- cppunittest
301+
299302
windows10-2009-tests:
300303
- cppunittest
301304
- gtest

testing/cppunittest.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
["TestAlgorithm"]
66

7+
["TestArm64Disassembler"]
8+
run-if = ["os == 'win' && processor == 'aarch64'"]
9+
710
["TestArray"]
811

912
["TestArrayUtils"]
@@ -47,10 +50,7 @@ run-if = ["os == 'win'"]
4750
run-if = ["os == 'win'"]
4851

4952
["TestDllInterceptorCrossProcess"]
50-
run-if = [
51-
"os == 'win' && processor == 'x86'",
52-
"os == 'win' && processor == 'x86_64'",
53-
]
53+
run-if = ["os == 'win' && processor != 'aarch64'"]
5454

5555
["TestDoublyLinkedList"]
5656

@@ -75,6 +75,7 @@ run-if = [
7575
["TestIATPatcher"]
7676
run-if = ["os == 'win'"]
7777
skip-if = [
78+
"processor == 'aarch64'", # requires administrator permission on aarch64
7879
"win11_2009 && bits == 32", # fails on windows10x32
7980
"os == 'win' && os_version == '11.26100' && processor == 'x86'", # fails on win/x86
8081
]

0 commit comments

Comments
 (0)