Skip to content

Commit ce7e6b1

Browse files
Skip tests that require QEMU 9.
1 parent a9c0814 commit ce7e6b1

File tree

6 files changed

+21
-66
lines changed

6 files changed

+21
-66
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: Build
88
jobs:
99
# Build the workspace for a target architecture
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212
strategy:
1313
matrix:
1414
rust: [stable, 1.82]
@@ -31,7 +31,7 @@ jobs:
3131
3232
# Build the host tools
3333
build-host:
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-24.04
3535
strategy:
3636
matrix:
3737
rust: [stable, 1.82]
@@ -49,7 +49,7 @@ jobs:
4949
5050
# Build the workspace for the target architecture but using nightly to compile libcore
5151
build-tier3:
52-
runs-on: ubuntu-latest
52+
runs-on: ubuntu-24.04
5353
strategy:
5454
matrix:
5555
target:
@@ -72,14 +72,14 @@ jobs:
7272
7373
# Gather all the above build jobs together for the purposes of getting an overall pass-fail
7474
build-all:
75-
runs-on: ubuntu-latest
75+
runs-on: ubuntu-24.04
7676
needs: [build, build-tier3, build-host]
7777
steps:
7878
- run: /bin/true
7979

8080
# Build the docs for the workspace
8181
docs:
82-
runs-on: ubuntu-latest
82+
runs-on: ubuntu-24.04
8383
strategy:
8484
matrix:
8585
rust: [stable, 1.82]
@@ -102,7 +102,7 @@ jobs:
102102
103103
# Build the docs for the host tools
104104
docs-host:
105-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-24.04
106106
strategy:
107107
matrix:
108108
rust: [stable, 1.82]
@@ -120,14 +120,14 @@ jobs:
120120
121121
# Gather all the above doc jobs together for the purposes of getting an overall pass-fail
122122
docs-all:
123-
runs-on: ubuntu-latest
123+
runs-on: ubuntu-24.04
124124
needs: [docs, docs-host]
125125
steps:
126126
- run: /bin/true
127127

128128
# Format the workspace
129129
fmt:
130-
runs-on: ubuntu-latest
130+
runs-on: ubuntu-24.04
131131
steps:
132132
- name: Checkout
133133
uses: actions/checkout@v4
@@ -141,7 +141,7 @@ jobs:
141141
142142
# Format the host tools
143143
fmt-host:
144-
runs-on: ubuntu-latest
144+
runs-on: ubuntu-24.04
145145
steps:
146146
- name: Checkout
147147
uses: actions/checkout@v4
@@ -156,14 +156,14 @@ jobs:
156156
157157
# Gather all the above fmt jobs together for the purposes of getting an overall pass-fail
158158
fmt-all:
159-
runs-on: ubuntu-latest
159+
runs-on: ubuntu-24.04
160160
needs: [fmt, fmt-host]
161161
steps:
162162
- run: /bin/true
163163

164164
# Run clippy on the workpace
165165
clippy:
166-
runs-on: ubuntu-latest
166+
runs-on: ubuntu-24.04
167167
strategy:
168168
matrix:
169169
rust: [stable, 1.82]
@@ -187,7 +187,7 @@ jobs:
187187
188188
# Run clippy on the host tools
189189
clippy-host:
190-
runs-on: ubuntu-latest
190+
runs-on: ubuntu-24.04
191191
strategy:
192192
matrix:
193193
rust: [stable, 1.82]
@@ -206,14 +206,14 @@ jobs:
206206
207207
# Gather all the above clippy jobs together for the purposes of getting an overall pass-fail
208208
clippy-all:
209-
runs-on: ubuntu-latest
209+
runs-on: ubuntu-24.04
210210
needs: [clippy, clippy-host]
211211
steps:
212212
- run: /bin/true
213213

214214
# Run some programs in QEMU
215215
test:
216-
runs-on: ubuntu-latest
216+
runs-on: ubuntu-24.04
217217
needs: [build-all]
218218
steps:
219219
- run: sudo apt-get -y update && sudo apt-get -y install qemu-system-arm
@@ -223,7 +223,7 @@ jobs:
223223

224224
# Gather all the above xxx-all jobs together for the purposes of getting an overall pass-fail
225225
all:
226-
runs-on: ubuntu-latest
226+
runs-on: ubuntu-24.04
227227
needs: [docs-all, build-all, fmt-all, test] # not gating on clippy-all
228228
steps:
229229
- run: /bin/true

cortex-r-examples/reference/gic-armv8r-none-eabihf.out

Lines changed: 0 additions & 12 deletions
This file was deleted.

cortex-r-examples/reference/hello-armv8r-none-eabihf.out

Lines changed: 0 additions & 11 deletions
This file was deleted.

cortex-r-examples/reference/registers-armv8r-none-eabihf.out

Lines changed: 0 additions & 7 deletions
This file was deleted.

cortex-r-examples/reference/svc-armv8r-none-eabihf.out

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
rustup target add armv7r-none-eabi
77
rustup target add armv7r-none-eabihf
8-
rustup install nightly # used for Tier 3 armv8r-none-eabihf
9-
rustup component add rust-src --toolchain=nightly
108

119
FAILURE=0
1210

@@ -31,11 +29,12 @@ for binary in hello registers svc; do
3129
diff ./cortex-r-examples/reference/$binary-armv7r-none-eabihf.out ./target/$binary-armv7r-none-eabihf.out || fail $binary "armv7r-none-eabihf"
3230
done
3331

34-
# armv8r-none-eabihf tests
35-
for binary in hello registers svc gic; do
36-
cargo +nightly run --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
37-
diff ./cortex-r-examples/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
38-
done
32+
# Ubuntu 24.04 supplies QEMU 8, which doesn't support the machine we have configured for this target
33+
# # armv8r-none-eabihf tests
34+
# for binary in hello registers svc gic; do
35+
# cargo +nightly run --target=armv8r-none-eabihf --bin $binary --features=gic -Zbuild-std=core | tee ./target/$binary-armv8r-none-eabihf.out
36+
# diff ./cortex-r-examples/reference/$binary-armv8r-none-eabihf.out ./target/$binary-armv8r-none-eabihf.out || fail $binary "armv8r-none-eabihf"
37+
# done
3938

4039
if [ "$FAILURE" == "1" ]; then
4140
echo "Output comparison failed!"

0 commit comments

Comments
 (0)