From 0e7f279bd6b1ee4fe564c999d953a5dc1e520bf3 Mon Sep 17 00:00:00 2001 From: Yuke Peng Date: Tue, 7 Nov 2023 21:09:44 -0800 Subject: [PATCH] Enable CI for MicroVM --- .github/workflows/integration_test.yml | 4 +++- framework/jinux-frame/src/boot/kcmdline.rs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 86a307ec0..6ae685f86 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -28,4 +28,6 @@ jobs: id: syscall_test_linux run: make run AUTO_TEST=syscall ENABLE_KVM=0 BOOT_PROTOCOL=linux RELEASE_MODE=1 - # TODO: include the integration tests for MicroVM, which is not ready yet. + - name: Syscall Test (MicroVM) + id: syscall_test_microvm + run: make run AUTO_TEST=syscall ENABLE_KVM=0 BOOT_METHOD=microvm RELEASE_MODE=1 diff --git a/framework/jinux-frame/src/boot/kcmdline.rs b/framework/jinux-frame/src/boot/kcmdline.rs index 8400a99e0..0b943a7c9 100644 --- a/framework/jinux-frame/src/boot/kcmdline.rs +++ b/framework/jinux-frame/src/boot/kcmdline.rs @@ -13,6 +13,7 @@ use alloc::{ vec, vec::Vec, }; +use log::warn; #[derive(PartialEq, Debug)] struct InitprocArgs { @@ -82,7 +83,8 @@ impl From<&str> for KCmdlineArg { // by the analysis over the Backus–Naur form syntax tree. for arg in split_arg(cmdline) { // FIXME: The -kernel option in QEMU seems to add this string to the command line, which we skip for now. - if arg.starts_with("target/x86_64-custom/debug/jinux") { + if arg.starts_with("target/x86_64-custom/") { + warn!("Found kcmdline: {:?}, skipped for now.", arg); continue; } // Cmdline => KernelArg "--" InitArg