integration-test: Tests run now using Limine (no UEFI so far)

Author: phip1611

integration-test/bins/multiboot2_chainloader/Cargo.toml

@@ -1,6 +1,9 @@
 [package]
 name = "multiboot2_chainloader"
-description = "Integrationtest: Multiboot2 chainloader"
+description = """
+Integrationtest: Multiboot2 chainloader. The loader itself loads via Multiboot1,
+but the payload is loaded via Multiboot2 by the loader.
+"""
 version = "0.1.0"
 edition = "2021"
 publish = false

integration-test/bins/multiboot2_chainloader/src/main.rs

@@ -19,8 +19,6 @@ core::arch::global_asm!(include_str!("start.S"), options(att_syntax));
 #[no_mangle]
 fn rust_entry(multiboot_magic: u32, multiboot_hdr: *const u32) -> ! {
     init_environment();
-    let x = 0.12 + 0.56;
-    log::debug!("{x}");
     log::debug!("multiboot_hdr={multiboot_hdr:x?}, multiboot_magic=0x{multiboot_magic:x?}");
     let mbi = multiboot::get_mbi(multiboot_magic, multiboot_hdr as u32).unwrap();
     let module_iter = mbi.modules().expect("Should provide modules");

integration-test/bins/multiboot2_payload/src/main.rs

@@ -29,7 +29,9 @@ fn main(multiboot2_magic: u32, multiboot2_hdr: u32) -> anyhow::Result<()> {
     if multiboot2_magic != multiboot2::MAGIC {
         Err(anyhow::Error::msg("Invalid bootloader magic"))?
     }
-    log::debug!("multiboot2_hdr={multiboot2_hdr:x?}, multiboot2_magic=0x{multiboot2_magic:x?}");
+    log::debug!(
+        "multiboot2_hdr=0x{multiboot2_hdr:08x?}, multiboot2_magic=0x{multiboot2_magic:08x?}"
+    );
 
     let mbi_ptr = (multiboot2_hdr as *const u8).cast();
     let mbi = unsafe { BootInformation::load(mbi_ptr) }.map_err(anyhow::Error::msg)?;

integration-test/bins/multiboot2_payload/src/multiboot2_header.S

@@ -21,7 +21,7 @@
         .align 8
         .Lmb2_header_tag_information_request_start:
             .word  1       # type  (16bit)
-            .word  0       # flags (16bit)
+            .word  1       # flags (16bit)
             .long  .Lmb2_header_tag_information_request_end - .Lmb2_header_tag_information_request_start # size  (32bit)
             .long  1
             .long  2

integration-test/bins/multiboot2_payload/src/verify/grub.rs renamed to integration-test/bins/multiboot2_payload/src/verify/limine.rs

@@ -23,7 +23,7 @@ fn basic_sanity_checks(mbi: &BootInformation) -> anyhow::Result<()> {
         .map_err(anyhow::Error::msg)?
         .cmdline()
         .map_err(anyhow::Error::msg)?;
-    assert!(bootloader_name.starts_with("GRUB 2."));
+    assert!(bootloader_name.starts_with("Limine 7."));
     assert_eq!(cmdline, "some commandline arguments");
 
     Ok(())

integration-test/bins/multiboot2_payload/src/verify/mod.rs

@@ -1,5 +1,5 @@
 mod chainloader;
-mod grub;
+mod limine;
 
 use alloc::format;
 use alloc::vec::Vec;
@@ -16,9 +16,9 @@ pub fn run(mbi: &BootInformation) -> anyhow::Result<()> {
         .name()
         .map_err(anyhow::Error::msg)?;
 
-    if bootloader.to_lowercase().contains("grub") {
-        log::info!("loaded by grub");
-        grub::run(mbi)?;
+    if bootloader.to_lowercase().contains("limine") {
+        log::info!("loaded by Limine");
+        limine::run(mbi)?;
     } else {
         log::info!("loaded by chainloader");
         chainloader::run(mbi)?;
@@ -78,6 +78,15 @@ pub(self) fn print_module_info(mbi: &BootInformation) -> anyhow::Result<()> {
     }
     let module = modules.first().unwrap();
     let module_cmdline = module.cmdline().map_err(anyhow::Error::msg)?;
+
+    let allowed_module_cmdlines = ["Limine bootloader config", "multiboot2_payload"];
+    assert!(
+        allowed_module_cmdlines
+            .iter()
+            .any(|&str| module_cmdline == str),
+        "The module cmdline must be one of {allowed_module_cmdlines:?} but is {module_cmdline}"
+    );
+
     println!("Modules:");
     println!(
         "  0x{:010x} - 0x{:010x} ({} B, cmdline='{}')",
@@ -86,13 +95,13 @@ pub(self) fn print_module_info(mbi: &BootInformation) -> anyhow::Result<()> {
         module.module_size(),
         module_cmdline
     );
-    println!(" grub cfg passed as boot module:");
+    println!(" bootloader cfg passed as boot module:");
     let grup_cfg_ptr = module.start_address() as *const u32 as *const u8;
     let grub_cfg =
         unsafe { core::slice::from_raw_parts(grup_cfg_ptr, module.module_size() as usize) };
 
-    // In the GRUB bootflow case, we pass the config as module with it. This is
-    // not done for the chainloaded case.
+    // In the Limine bootflow case, we pass the config as module with it. This
+    // is not done for the chainloaded case.
     if let Ok(str) = core::str::from_utf8(grub_cfg) {
         println!("=== file begin ===");
         for line in str.lines() {

integration-test/run.sh

@@ -141,7 +141,7 @@ function fn_test_payload() {
     fn_build_limine_iso
 
     fn_run_test_bios $TEST_DIR/image.iso
-    fn_run_test_uefi $TEST_DIR/image.iso
+    #fn_run_test_uefi $TEST_DIR/image.iso
 }
 
 # Tests the loader by chainloading the Multiboot2 payload.
@@ -155,7 +155,7 @@ function fn_test_loader() {
     fn_build_limine_iso
 
     fn_run_test_bios $TEST_DIR/image.iso
-    fn_run_test_uefi $TEST_DIR/image.iso
+    #fn_run_test_uefi $TEST_DIR/image.iso
 }
 
 fn_main

integration-test/tests/01-boot-payload/limine.cfg

@@ -6,4 +6,6 @@ INTERFACE_BRANDING=integration-test
 :integration-test
 PROTOCOL=multiboot2
 KERNEL_PATH=boot:///kernel
-KERNEL_CMDLINE=some kernel cmdline
+KERNEL_CMDLINE=some commandline arguments
+MODULE_PATH=boot:///limine.cfg
+MODULE_STRING=Limine bootloader config

integration-test/tests/02-boot-loader-and-chainload/limine.cfg

@@ -4,9 +4,9 @@ VERBOSE=yes
 INTERFACE_BRANDING=integration-test
 
 :integration-test
-# For legacy reasons, the loader itself boots via Multiboot 1. Sufficient.
+# For simplicity reasons, the loader itself boots via Multiboot 1. Sufficient.
 PROTOCOL=multiboot
 KERNEL_PATH=boot:///kernel
 KERNEL_CMDLINE=some kernel cmdline
 MODULE_PATH=boot:///payload
-KERNEL_CMDLINE=some payload cmdline
+MODULE_STRING=multiboot2_payload