Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2761c80

Browse files
Update Rust CI workflow (#141)
Should give us green CI again.
1 parent 8c3695e commit 2761c80

File tree

4 files changed

+30
-6
lines changed

4 files changed

+30
-6
lines changed

‎.github/workflows/rust.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
branches: [ master ]
66
pull_request:
77
branches: [ master ]
8+
schedule:
9+
- cron: '0 0 * * 0-6'
810

911
jobs:
1012
build_and_test:
@@ -31,7 +33,9 @@ jobs:
3133
mv -v *.fd uefi-test-runner
3234
3335
- name: Install qemu
34-
run: sudo apt-get install qemu -y
36+
run: |
37+
sudo apt-get update
38+
sudo apt-get install qemu -y
3539
3640
- name: Install latest nightly
3741
uses: actions-rs/toolchain@v1
@@ -50,7 +54,7 @@ jobs:
5054
working-directory: ./uefi-test-runner
5155

5256
- name: Run tests
53-
run: ./build.py run --headless
57+
run: ./build.py run --headless --ci
5458
working-directory: ./uefi-test-runner
5559

5660
lints:
@@ -74,6 +78,7 @@ jobs:
7478
command: fmt
7579
args: --all -- --check
7680

77-
- uses: actions-rs/clippy-check@v1
81+
- name: Run clippy
82+
uses: actions-rs/clippy-check@v1
7883
with:
7984
token: ${{ secrets.GITHUB_TOKEN }}

‎uefi-test-runner/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ uefi-services = { path = "../uefi-services" }
1212
log = { version = "0.4.8", default-features = false }
1313

1414
[features]
15+
# This feature should only be enabled in our CI, it disables some tests
16+
# which currently fail in that environment (see #103 for discussion).
17+
ci = []
1518
qemu = ["uefi-services/qemu"]

‎uefi-test-runner/build.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
'headless': False,
2727
# Configuration to build.
2828
'config': 'debug',
29+
# Disables some tests which don't work in our CI setup
30+
'ci': False,
2931
# QEMU executable to use
3032
# Indexed by the `arch` setting
3133
'qemu_binary': {
@@ -98,6 +100,9 @@ def build(*test_flags):
98100
if SETTINGS['config'] == 'release':
99101
xbuild_args.append('--release')
100102

103+
if SETTINGS['ci']:
104+
xbuild_args.extend(['--features', 'ci'])
105+
101106
run_xbuild(*xbuild_args)
102107

103108
# Copy the built test runner file to the right directory for running tests.
@@ -195,15 +200,17 @@ def run_qemu():
195200

196201
if arch == 'x86_64':
197202
qemu_flags.extend([
198-
# Use a modern machine, with acceleration if possible.
199-
'-machine', 'q35,accel=kvm:tcg',
200-
203+
# Use a modern machine,.
204+
'-machine', 'q35',
201205
# Multi-processor services protocol test needs exactly 3 CPUs.
202206
'-smp', '3',
203207

204208
# Allocate some memory.
205209
'-m', '128M',
206210
])
211+
if not SETTINGS['ci']:
212+
# Enable acceleration if possible.
213+
qemu_flags.append('--enable-kvm')
207214
elif arch == 'aarch64':
208215
qemu_flags.extend([
209216
# Use a generic ARM environment. Sadly qemu can't emulate a RPi 4 like machine though
@@ -356,13 +363,17 @@ def main():
356363
parser.add_argument('--release', help='build in release mode',
357364
action='store_true')
358365

366+
parser.add_argument('--ci', help='disables some tests which currently break CI',
367+
action='store_true')
368+
359369
opts = parser.parse_args()
360370

361371
SETTINGS['arch'] = opts.target
362372
# Check if we need to enable verbose mode
363373
SETTINGS['verbose'] = opts.verbose
364374
SETTINGS['headless'] = opts.headless
365375
SETTINGS['config'] = 'release' if opts.release else 'debug'
376+
SETTINGS['ci'] = opts.ci
366377

367378
verb = opts.verb
368379

‎uefi-test-runner/src/proto/pi/mp.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ fn test_enable_disable_ap(mps: &MPServices) {
140140
}
141141

142142
fn test_switch_bsp_and_who_am_i(mps: &MPServices) {
143+
// This test breaks CI. See #103.
144+
if cfg!(feature = "ci") {
145+
return;
146+
}
147+
143148
// Normally BSP starts on on CPU 0
144149
let proc_number = mps.who_am_i().unwrap().unwrap();
145150
assert_eq!(proc_number, 0);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /