Use entry_point! in all tests*

src/lib.rs

@@ -65,9 +65,17 @@ pub fn hlt_loop() -> ! {
     }
 }
 
+
 #[cfg(test)]
-#[no_mangle]
-pub extern "C" fn _start() -> ! {
+use bootloader::{entry_point, BootInfo};
+
+#[cfg(test)]
+entry_point!(test_kernel_main);
+
+/// Entry point for `cargo xtest`
+#[cfg(test)]
+fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
+    init();
     test_main();
     loop {}
 }

tests/basic_boot.rs

@@ -8,8 +8,15 @@ use core::panic::PanicInfo;
 use polling_serial::{serial_print, serial_println};
 use vga_buffer::{print, println};
 
-#[no_mangle] // don't mangle the name of this function
-pub extern "C" fn _start() -> ! {
+
+use bootloader::{entry_point, BootInfo};
+
+entry_point!(test_kernel_main);
+
+/// Entry point for `cargo xtest`
+
+fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
+    dendrobates_tinctoreus_azureus::init();
     test_main();
 
     loop {}

tests/panic_test.rs

@@ -5,8 +5,14 @@ use core::panic::PanicInfo;
 use dendrobates_tinctoreus_azureus::{exit_qemu, QemuExitCode};
 use polling_serial::{serial_print, serial_println};
 
-#[no_mangle]
-pub extern "C" fn _start() -> ! {
+use bootloader::{entry_point, BootInfo};
+
+entry_point!(test_kernel_main);
+
+/// Entry point for `cargo xtest`
+
+fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
+    dendrobates_tinctoreus_azureus::init();
     should_fail();
     serial_println!("[test did not panic]");
     exit_qemu(QemuExitCode::Failed);

tests/sse_interrupt_test.rs

@@ -20,8 +20,14 @@ use vga_buffer::{print, println};
 use volatile::Volatile;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
 
-#[no_mangle] // don't mangle the name of this function
-pub extern "C" fn _start() -> ! {
+use bootloader::{entry_point, BootInfo};
+
+entry_point!(test_kernel_main);
+
+/// Entry point for `cargo xtest`
+
+fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
+    dendrobates_tinctoreus_azureus::init();
     test_main();
 
     loop {}

tests/stack_overflow.rs

@@ -9,8 +9,13 @@ use core::panic::PanicInfo;
 use dendrobates_tinctoreus_azureus::{exit_qemu, QemuExitCode};
 use polling_serial::{serial_print, serial_println};
 
-#[no_mangle]
-pub extern "C" fn _start() -> ! {
+use bootloader::{entry_point, BootInfo};
+
+entry_point!(test_kernel_main);
+
+/// Entry point for `cargo xtest`
+
+fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
     serial_print!("stack_overflow... ");
 
     dendrobates_tinctoreus_azureus::gdt::init();