xxx

Author: phip1611

Cargo.lock

@@ -30,7 +30,6 @@ uefi-raw = { version = "~0.11", default-features = false }
 
 # Dependencies for integration tests
 anyhow = { version = "1.0", default-features = false }
-multiboot = { version = "0.8", default-features = false }
 elf_rs = { version = "0.3", default-features = false }
 good_memory_allocator = { version = "0.1", default-features = false }
 integration-test-util = { path = "./integration-test/bins/util" }

Cargo.toml

@@ -36,9 +36,9 @@ fn assert_load_segment_fits_into_memory(
         .iter()
         .find(|(a_start, a_size)| start >= *a_start && end <= a_start + a_size);
     if let Some(range) = range {
-        debug!("Can load load segment (0x{start:x?}, {size:x?}) into free memory area {range:#x?}");
+        debug!("Can load load segment ({start:#x?}, {size:#x?}) into free memory area {range:#x?}");
     } else {
-        panic!("Can't load load segment  (0x{start:x?}, {size:x?}) into any area!");
+        panic!("Can't load load segment  ({start:#x?}, {size:#x?}) into any area!");
     }
 }
 

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

@@ -7,7 +7,7 @@ IFS=$'\n\t'
 DIR=$(dirname "$(realpath "$0")")
 cd "$DIR" || exit
 
-BINS_DIR=bins/target/x86-unknown-none/release
+BINS_DIR=../target/x86-unknown-none/release-integration-test
 ANSI_HIGHLIGHT="\e[1;32m" # green + bold
 ANSI_HIGHLIGHT_ERROR="\e[1;31m" # red + bold
 ANSI_RESET="\e[0m"