Skip to content

Commit 8273c36

Browse files
committed
fixed testing harness, added panic=abort for android, fixed env var typo,
1 parent 105f93a commit 8273c36

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

.github/workflows/aarch64.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ jobs:
1717

1818
test-neon:
1919
strategy:
20-
fail-fast: false
2120
matrix:
2221
channel: [ stable, beta, nightly ]
2322
name: Test of Neon on ${{ inputs.target }} with ${{ matrix.channel }}
2423
uses: ./.github/workflows/runtest.yml
2524
with:
2625
target: ${{ inputs.target }}
2726
channel: ${{ matrix.channel }}
28-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+aes', inputs.target-in-caps) }}
27+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+aes', inputs.target-in-caps) }}

.github/workflows/armv8.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
with:
2222
target: ${{ inputs.target }}
2323
channel: nightly
24-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+v8,+aes', inputs.target-in-caps) }}
24+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+v8,+aes', inputs.target-in-caps) }}

.github/workflows/other.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
jobs:
1010
test-software:
1111
strategy:
12-
fail-fast: false
1312
matrix:
1413
channel: [ stable, beta, nightly ]
1514
name: Test of Software AES on ${{ inputs.target }} with ${{ matrix.channel }}

.github/workflows/riscv.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
with:
2222
target: ${{ inputs.target }}
2323
channel: nightly
24-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+zkne,+zknd', inputs.target-in-caps) }}
24+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+zkne,+zknd', inputs.target-in-caps) }}

.github/workflows/runtest.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v3
2222

23-
- run: ${{ format('echo "{0}" >> $GITHUB_ENV', inputs.env-vars) }}
23+
- run: ${{ format('echo "{0} -C panic=abort" >> $GITHUB_ENV', inputs.env-vars) }}
2424

2525
- name: Install Rust
2626
uses: actions-rs/toolchain@v1
2727
with:
2828
toolchain: ${{ inputs.channel }}
29-
target: ${{ inputs.target }}
3029
profile: minimal
3130
components: clippy
3231
override: true

.github/workflows/x86.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,27 @@ jobs:
1717

1818
test-aesni:
1919
strategy:
20-
fail-fast: false
2120
matrix:
2221
channel: [ stable, beta, nightly ]
2322
name: Test of AESNI on ${{ inputs.target }} with ${{ matrix.channel }}
2423
uses: ./.github/workflows/runtest.yml
2524
with:
2625
target: ${{ inputs.target }}
2726
channel: ${{ matrix.channel }}
28-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+sse4.1,+aes', inputs.target-in-caps) }}
27+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+sse4.1,+aes', inputs.target-in-caps) }}
2928

3029
test-aesni-vaes:
3130
name: Test of AESNI with VAES on ${{ inputs.target }}
3231
uses: ./.github/workflows/runtest.yml
3332
with:
3433
target: ${{ inputs.target }}
3534
channel: nightly
36-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+vaes', inputs.target-in-caps) }}
35+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+vaes', inputs.target-in-caps) }}
3736

3837
test-aesni-vaes-avx512f:
3938
name: Test of AESNI with VAES and AVX-512 on ${{ inputs.target }}
4039
uses: ./.github/workflows/runtest.yml
4140
with:
4241
target: ${{ inputs.target }}
4342
channel: nightly
44-
env-vars: ${{ format('CROSS_TARGET_{0}_RUSTFLAGS=+vaes,+avx512f', inputs.target-in-caps) }}
43+
env-vars: ${{ format('CARGO_TARGET_{0}_RUSTFLAGS=-C target-feature=+vaes,+avx512f', inputs.target-in-caps) }}

0 commit comments

Comments
 (0)