Fix test framework

phil-opp · phil-opp · commit 464e80e110d0 · 2020-10-30T15:34:24.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/test_kernels/default_settings/Cargo.toml b/tests/test_kernels/default_settings/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 
 [dependencies]
 bootloader = { path = "../../.." }
-x86_64 = { git = "https://github.com/rust-osdev/x86_64.git", branch = "nop" }
+x86_64 = "0.12.2"
diff --git a/tests/test_kernels/default_settings/src/bin/basic_boot.rs b/tests/test_kernels/default_settings/src/bin/basic_boot.rs
@@ -7,7 +7,7 @@ use kernel::{exit_qemu, QemuExitCode};
 
 entry_point!(kernel_main);
 
-fn kernel_main(_boot_info: &'static BootInfo) -> ! {
+fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
     exit_qemu(QemuExitCode::Success);
 }
 
diff --git a/tests/test_kernels/default_settings/src/bin/should_panic.rs b/tests/test_kernels/default_settings/src/bin/should_panic.rs
@@ -7,7 +7,7 @@ use kernel::{exit_qemu, QemuExitCode};
 
 entry_point!(kernel_main);
 
-fn kernel_main(_boot_info: &'static BootInfo) -> ! {
+fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {
     panic!();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use kernel::{exit_qemu, QemuExitCode};`
`7`	`7`
`8`	`8`	`entry_point!(kernel_main);`
`9`	`9`
`10`		`-fn kernel_main(_boot_info: &'static BootInfo) -> ! {`
	`10`	`+fn kernel_main(_boot_info: &'static mut BootInfo) -> ! {`
`11`	`11`	`exit_qemu(QemuExitCode::Success);`
`12`	`12`	`}`
`13`	`13`