Skip to content

Commit 105f93a

Browse files
committed
fixed testing harness, added all test-supported cross targets (todo: add other cross toolchains (cross-rs/cross-toolchains))
1 parent 3daaa36 commit 105f93a

File tree

4 files changed

+79
-32
lines changed

4 files changed

+79
-32
lines changed

.github/workflows/arm.yml .github/workflows/aarch64.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ARM Test
1+
name: AArch64 Test
22
on:
33
workflow_call:
44
inputs:

.github/workflows/armv8.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: ARMv8 Test
2+
on:
3+
workflow_call:
4+
inputs:
5+
target:
6+
required: true
7+
type: string
8+
target-in-caps:
9+
required: true
10+
type: string
11+
12+
jobs:
13+
test-software:
14+
uses: ./.github/workflows/other.yml
15+
with:
16+
target: ${{ inputs.target }}
17+
18+
test-neon:
19+
name: Test of Neon on ${{ inputs.target }}
20+
uses: ./.github/workflows/runtest.yml
21+
with:
22+
target: ${{ inputs.target }}
23+
channel: nightly
24+
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+v8,+aes', inputs.target-in-caps) }}

.github/workflows/common.yml

+53-31
Original file line numberDiff line numberDiff line change
@@ -32,51 +32,57 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
target:
35-
# Tier 1
36-
- triple: x86_64-unknown-linux-gnu
37-
caps: X86_64_UNKNOWN_LINUX_GNU
35+
# 64-bit
36+
- triple: x86_64-linux-android
37+
caps: X86_64_LINUX_ANDROID
3838
- triple: x86_64-pc-windows-gnu
3939
caps: X86_64_PC_WINDOWS_GNU
40-
- triple: x86_64-pc-windows-msvc
41-
caps: X86_64_PC_WINDOWS_MSVC
42-
- triple: x86_64-apple-darwin
43-
caps: X86_64_APPLE_DARWIN
44-
- triple: i686-unknown-linux-gnu
45-
caps: I686_UNKNOWN_LINUX_GNU
40+
- triple: x86_64-unknown-linux-gnu
41+
caps: X86_64_UNKNOWN_LINUX_GNU
42+
- triple: x86_64-unknown-linux-musl
43+
caps: X86_64_UNKNOWN_LINUX_MUSL
44+
# 32-bit
45+
- triple: i686-linux-android
46+
caps: I686_LINUX_ANDROID
4647
- triple: i686-pc-windows-gnu
4748
caps: I686_PC_WINDOWS_GNU
48-
- triple: i686-pc-windows-msvc
49-
caps: I686_PC_WINDOWS_MSVC
50-
#Tier 2 with Host Tools
51-
- triple: x86_64-unknown-freebsd
52-
caps: X86_64_UNKNOWN_FREEBSD
53-
- triple: x86_64-unknown-illumos
54-
caps: X86_64_UNKNOWN_ILLUMOS
55-
- target: x86_64-unknown-linux-musl
56-
caps: X86_64_UNKNOWN_LINUX_MUSL
57-
- target: x86_64-unknown-netbsd
58-
caps: X86_64_UNKNOWN_NETBSD
49+
- triple: i686-unknown-linux-gnu
50+
caps: I686_UNKNOWN_LINUX_GNU
51+
- triple: i586-unknown-linux-gnu
52+
caps: I586_UNKNOWN_LINUX_GNU
53+
- triple: i586-unknown-linux-musl
54+
caps: I586_UNKNOWN_LINUX_MUSL
5955
uses: ./.github/workflows/x86.yml
6056
with:
6157
target: ${{ matrix.target.triple }}
6258
target-in-caps: ${{ matrix.target.caps }}
6359

64-
test-arm:
60+
test-aarch64:
6561
strategy:
6662
fail-fast: false
6763
matrix:
6864
target:
69-
# Tier 1
65+
- triple: aarch64-linux-android
66+
caps: AARCH64_LINUX_ANDROID
7067
- triple: aarch64-unknown-linux-gnu
7168
caps: AARCH64_UNKNOWN_LINUX_GNU
72-
# Tier 2 with Host Tools
73-
- triple: aarch64-apple-darwin
74-
caps: AARCH64_APPLE_DARWIN
75-
- triple: aarch64-pc-windows-msvc
76-
caps: AARCH64_PC_WINDOWS_MSVC
7769
- triple: aarch64-unknown-linux-musl
7870
caps: AARCH64_UNKNOWN_LINUX_MUSL
79-
uses: ./.github/workflows/arm.yml
71+
uses: ./.github/workflows/aarch64.yml
72+
with:
73+
target: ${{ matrix.target.triple }}
74+
target-in-caps: ${{ matrix.target.caps }}
75+
76+
test-armv8:
77+
strategy:
78+
fail-fast: false
79+
matrix:
80+
target:
81+
- triple: thumbv7neon-linux-androideabi
82+
caps: THUMBV7NEON_LINUX_ANDROIDEABI
83+
- triple: thumbv7neon-unknown-linux-gnueabihf
84+
caps: THUMBV7NEON_UNKNOWN_LINUX_GNUEABIHF
85+
uses: ./.github/workflows/armv8.yml
8086
with:
8187
target: ${{ matrix.target.triple }}
8288
target-in-caps: ${{ matrix.target.caps }}
@@ -86,7 +92,6 @@ jobs:
8692
fail-fast: false
8793
matrix:
8894
target:
89-
# Tier 2 with Host Tools
9095
- triple: riscv64gc-unknown-linux-gnu
9196
caps: RISCV64GC_UNKNOWN_LINUX_GNU
9297
uses: ./.github/workflows/riscv.yml
@@ -99,15 +104,32 @@ jobs:
99104
fail-fast: false
100105
matrix:
101106
target:
102-
# Tier 2 with Host Tools
107+
- arm-linux-androideabi
103108
- arm-unknown-linux-gnueabi
104109
- arm-unknown-linux-gnueabihf
110+
- arm-unknown-linux-musleabi
111+
- arm-unknown-linux-musleabihf
112+
- armv5te-unknown-linux-gnueabi
113+
- armv5te-unknown-linux-musleabi
114+
- armv7-linux-androideabi
115+
- armv7-unknown-linux-gnueabi
105116
- armv7-unknown-linux-gnueabihf
117+
- armv7-unknown-linux-musleabi
118+
- armv7-unknown-linux-musleabihf
106119
- loongarch64-unknown-linux-gnu
120+
- mips-unknown-linux-gnu
121+
- mips-unknown-linux-musl
122+
- mips64-unknown-linux-gnuabi64
123+
- mips64-unknown-linux-muslabi64
124+
- mipsel-unknown-linux-gnu
125+
- mipsel-unknown-linux-musl
126+
- mips64el-unknown-linux-gnuabi64
127+
- mips64el-unknown-linux-muslabi64
107128
- powerpc-unknown-linux-gnu
108129
- powerpc64-unknown-linux-gnu
109130
- powerpc64le-unknown-linux-gnu
110-
- s390x-unknown-linux-gnu
131+
- sparc64-unknown-linux-gnu
132+
- wasm32-unknown-emscripten
111133
uses: ./.github/workflows/other.yml
112134
with:
113135
target: ${{ matrix.target }}

.github/workflows/runtest.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
required: false
1313
type: string
1414
default: ''
15+
1516
jobs:
1617
test:
1718
continue-on-error: ${{ inputs.channel == 'nightly' }}

0 commit comments

Comments
 (0)