Skip to content

Commit 5a923d8

Browse files
committed
integration-test: fix integration guest runner shell checks
Keep the QEMU and Cloud Hypervisor invocations in the same shell as the rc=$$? capture so failures are reported correctly, and make the shared integration-test toolchain explicitly include the built-in riscv64gc-unknown-none-elf target used by the MMIO guest.
1 parent 8181840 commit 5a923d8

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

integration-test/riscv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ run: | build
1919
-monitor none \
2020
-no-reboot \
2121
-nodefaults \
22-
-serial file:serial.qemu.mmio-riscv.txt
22+
-serial file:serial.qemu.mmio-riscv.txt; \
2323
rc=$$? ; \
2424
if [ $$rc -ne 0 ]; then \
2525
echo "QEMU RISC-V MMIO Test Run Failed. rc=$$rc" >&2 ; \

integration-test/rust-toolchain.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
# rustc 1.96 - nightly needed for the build-std feature
77
channel = "nightly-2026-03-17"
88
profile = "minimal"
9-
targets = [ "x86_64-unknown-linux-gnu" ]
9+
targets = [
10+
"x86_64-unknown-linux-gnu",
11+
"riscv64gc-unknown-none-elf",
12+
]
1013
components = [
1114
"cargo",
1215
"clippy",

integration-test/x86/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ run_chv: | build
4040
--console off \
4141
--debug-console tty \
4242
--serial file=serial.chv.pio.txt \
43-
--kernel target/x86-unknown-none/release/kernel-x86.elf64
43+
--kernel target/x86-unknown-none/release/kernel-x86.elf64; \
4444
rc=$$? ; \
4545
if [ $$rc -ne 0 ]; then \
4646
echo "Cloud Hypervisor Test Run Failed. rc=$$rc" >&2 ; \

0 commit comments

Comments
 (0)