add a broader CI target for hosted mode

this will help prevent bugs slipping through where I forget to update
hosted mode stubs when tweaking hardware APIs
This commit is contained in:
bunnie 2022-03-18 03:21:46 +08:00
parent 4044a1d2c1
commit fbf90efe0e

View file

@ -312,8 +312,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Some("pddb-ci") => { Some("pddb-ci") => {
generate_app_menus(&Vec::<String>::new()); generate_app_menus(&Vec::<String>::new());
run(false, &hw_pkgs, Some( run(false, &hw_pkgs, Some(
&["--features", "pddb/ci", "--features", "pddb/deterministic"] &["--features", "pddb/ci", "--features", "pddb/deterministic"],
))?}, ),
false,
)?},
Some("run") => { Some("run") => {
let mut args = env::args(); let mut args = env::args();
args.nth(1); args.nth(1);
@ -328,7 +330,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
pkgs.push(app); pkgs.push(app);
} }
generate_app_menus(&apps); generate_app_menus(&apps);
run(false, &pkgs, None)? run(false, &pkgs, None, false)?
},
Some("hosted-ci") => {
let mut pkgs = hw_pkgs.to_vec();
let mut apps: Vec<String> = args.collect();
apps.push("ball".to_string());
apps.push("repl".to_string());
for app in &apps {
pkgs.push(app);
}
generate_app_menus(&apps);
run(false, &pkgs, None, true)?
}, },
Some("debug") => { Some("debug") => {
let mut args = env::args(); let mut args = env::args();
@ -344,7 +357,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
pkgs.push(app); pkgs.push(app);
} }
generate_app_menus(&apps); generate_app_menus(&apps);
run(true, &pkgs, None)? run(true, &pkgs, None, false)?
}, },
Some("app-image") => { Some("app-image") => {
let mut args = env::args(); let mut args = env::args();
@ -377,7 +390,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
&pkgs, lkey, kkey, None, &[], None)? &pkgs, lkey, kkey, None, &[], None)?
} }
Some("gfx-dev") => { Some("gfx-dev") => {
run(true, &gfx_dev_pkgs, Some(&["--features", "graphics-server/testing"]))? run(true, &gfx_dev_pkgs, Some(&["--features", "graphics-server/testing"]), false)?
} }
Some("pddb-dev") => build_hw_image( Some("pddb-dev") => build_hw_image(
false, false,
@ -388,7 +401,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
None, None,
&[], None, &[], None,
)?, )?,
Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None)?, Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None, false)?,
Some("benchmark") => build_hw_image( Some("benchmark") => build_hw_image(
false, false,
env::args().nth(2), env::args().nth(2),
@ -829,7 +842,7 @@ fn renode_image(
) )
} }
fn run(debug: bool, init: &[&str], features: Option<&[&str]>) -> Result<(), DynError> { fn run(debug: bool, init: &[&str], features: Option<&[&str]>, dry_run: bool) -> Result<(), DynError> {
let stream = if debug { "debug" } else { "release" }; let stream = if debug { "debug" } else { "release" };
build(init, debug, None, None, None, features)?; build(init, debug, None, None, None, features)?;
@ -860,13 +873,15 @@ fn run(debug: bool, init: &[&str], features: Option<&[&str]>) -> Result<(), DynE
let mut dir = project_root(); let mut dir = project_root();
dir.push("kernel"); dir.push("kernel");
println!("Building and running kernel..."); if !dry_run {
let status = Command::new(cargo()) println!("Building and running kernel...");
.current_dir(dir) let status = Command::new(cargo())
.args(&args) .current_dir(dir)
.status()?; .args(&args)
if !status.success() { .status()?;
return Err("cargo build failed".into()); if !status.success() {
return Err("cargo build failed".into());
}
} }
Ok(()) Ok(())