From b17a0a41bea7789178919f4a0999ea8519e1f897 Mon Sep 17 00:00:00 2001 From: natrixaeria Date: Sat, 9 Nov 2019 04:44:04 +0100 Subject: Introduce integration test crate --- kernel/src/lib.rs | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'kernel/src/lib.rs') diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 59888d1..e5ab3d3 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -11,47 +11,19 @@ pub mod interrupts; pub mod io; pub mod testing; -use core::fmt::Write; pub use io::qemu::{exit_qemu, QemuExitCode}; pub use io::vga_text::OStream; pub use io::{qemu, serial, vga_text}; +pub use qemu::*; +#[cfg(test)] #[no_mangle] pub extern "C" fn _start() -> ! { - interrupts::gdt::init(); - interrupts::table::init(); - if cfg!(test) { - #[cfg(test)] - test_main(); - qemu::exit_qemu(qemu::QemuExitCode::Success); - } - - x86_64::instructions::interrupts::int3(); - - /// TODO: write test - ///fn _loop(i: u64) -> u64 { - /// if i > 0b1010101001101101 { - /// return i; - /// } - /// let n = i; - /// let mut stdout = OStream::new(); - /// write!(&mut stdout, "{:x}", &n as *const u64 as u64).unwrap(); - /// _loop(i + 1) - ///} - ///_loop(0); - /// TODO: write test - ///x86_64::instructions::interrupts::int3(); loop {} } +#[cfg(test)] #[panic_handler] -#[no_mangle] -pub extern "C" fn panic_handler(info: &core::panic::PanicInfo) -> ! { - io::panic_screen::show(info.message()); - - if cfg!(test) { - write!(serial::SerialStream::new(), "Testing failed\n").unwrap(); - qemu::exit_qemu(qemu::QemuExitCode::Failed); - } +fn panic(_info: &core::panic::PanicInfo) -> ! { loop {} } -- cgit v1.2.3-54-g00ecf