AbleOS/ableos
2
2
Fork 15
Code Issues Pull requests 2 Projects Releases Wiki Activity

un-hard-code the tests #14

Merged
able merged 2 commits from wildwestrom/ableos:master into master 2024-05-31 10:44:43 -05:00
Conversation 0 Commits 2 Files changed 1 +22 -7
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit da606facb0 - Show all commits

29
repbuild/src/main.rs
View file

@ -139,10 +139,6 @@ fn get_fs() -> Result<FileSystem<impl ReadWriteSeek>, io::Error> {
let fs = FileSystem::new(img, FsOptions::new())?;
// TODO: Do not hard code these here
let p = Package::load_from_file("sysdata/programs/tests/meta.toml".to_owned());
p.build();
// Read the contents of the file using a `match` block
// to return the `data: Ok(c)` as a `String`
// or handle any `errors: Err(_)`.
@ -244,7 +240,26 @@ TERM_BACKDROP={}
let modules = value.get_mut("modules").unwrap().as_table_mut().unwrap();
// let mut real_modules = modules.clone();
for (key, value) in modules.into_iter() {
modules.into_iter().for_each(|(key, value)| {
if value.is_table() && key == "tests" {
let path = value
.get("path")
.expect("You must have `path` as a value")
.as_str()
.unwrap()
.split("boot:///")
.last()
.unwrap()
.split(".")
.next()
.unwrap();
let p = Package::load_from_file(
format!("sysdata/programs/{}/meta.toml", path).to_owned(),
);
p.build();
}
});
modules.into_iter().for_each(|(_key, value)| {
if value.is_table() {
let path = value.get("path").expect("You must have `path` as a value");
let default_value = Value::String("".into());
@ -258,10 +273,10 @@ TERM_BACKDROP={}
);
limine_str.push_str(&a);
}
}
});
// Copy modules into the test_programs directory
modules.into_iter().for_each(|(key, value)| {
modules.into_iter().for_each(|(_key, value)| {
if value.is_table() {
let path = value
.get("path")