From 1e0422eb84988464836a8f17fd7420b9f3cf277b Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sat, 9 Nov 2019 03:12:41 +0100 Subject: Add testing runner functions --- kernel/src/lib.rs | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'kernel/src/lib.rs') diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs index 87e8066..a81520b 100644 --- a/kernel/src/lib.rs +++ b/kernel/src/lib.rs @@ -3,26 +3,18 @@ #![feature(custom_test_frameworks)] #![feature(abi_x86_interrupt)] #![feature(panic_info_message)] -#![test_runner(crate::test_runner)] +#![test_runner(crate::testing::serial_test_runner)] #![reexport_test_harness_main = "test_main"] #![no_std] -mod interrupts; -mod io; +pub mod interrupts; +pub mod io; +pub mod testing; use core::fmt::Write; -use io::vga_text::OStream; -use io::{qemu, serial, vga_text}; - -#[cfg(test)] -pub fn test_runner(tests: &[&dyn Fn(&mut OStream)]) { - let mut stdout = OStream::new(); - stdout.clear(); - write!(&mut stdout, "running {} tests\n", tests.len()).unwrap(); - for test in tests { - test(&mut stdout) - } -} +pub use io::qemu::{exit_qemu, QemuExitCode}; +pub use io::vga_text::OStream; +pub use io::{qemu, serial, vga_text}; #[no_mangle] pub extern "C" fn _start() -> ! { -- cgit v1.2.3-54-g00ecf