Cargo.toml

@@ -17,7 +17,5 @@ features = ["spin_no_std"]
 
 
 [package.metadata.bootimage]
-test-args = ["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio",
-            "-display", "none"]
+test-args = ["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-serial", "stdio"]
 test-success-exit-code = 33 # (0x10 << 1) | 1
-test-timeout = 10 # timeout in seconds

src/main.rs

@@ -1,6 +1,7 @@
 // #![feature(abi_x86_interrupt, asm)]
 #![no_std]
 #![no_main]
+
 #![feature(custom_test_frameworks)]
 #![test_runner(crate::test_runner)]
 #![reexport_test_harness_main = "test_main"]
@@ -12,22 +13,12 @@ mod serial;
 
 use core::panic::PanicInfo;
 
-#[cfg(not(test))]
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     println!("{info}");
     loop {}
 }
 
-#[cfg(test)]
-#[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
-    serial_println!("[failed]\n");
-    serial_println!("Error: {}", info);
-    exit_qemu(QemuExitCode::Failed);
-    loop {}
-}
-
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
     #[cfg(test)]
@@ -52,26 +43,11 @@ pub fn exit_qemu(exit_code: QemuExitCode) {
     }
 }
 
-pub trait TestFunction {
-    fn run(&self) -> ();
-}
-
-impl<T> TestFunction for T
-where
-    T: Fn(),
-{
-    fn run(&self) {
-        serial_print!("{}...\t", core::any::type_name::<T>());
-        self();
-        serial_println!("[ok]");
-    }
-}
-
 #[cfg(test)]
-fn test_runner(tests: &[&dyn TestFunction]) {
+fn test_runner(tests: &[&dyn Fn()]) {
     serial_println!("Running {} test(s)", tests.len());
     for test in tests {
-        test.run();
+        test();
     }
 
     exit_qemu(QemuExitCode::Success);
@@ -79,10 +55,8 @@ fn test_runner(tests: &[&dyn TestFunction]) {
 
 #[test_case]
 fn basic_test() {
+    serial_print!("Trivial test... ");
     assert_eq!(5, 5);
+    serial_println!("[ok]");
 }
 
-#[test_case]
-fn basic_test2() {
-    assert_eq!(4, 4);
-}

src/serial.rs

@@ -1,6 +1,7 @@
-use lazy_static::lazy_static;
-use spin::Mutex;
 use uart_16550::SerialPort;
+use spin::Mutex;
+use lazy_static::lazy_static;
+
 
 lazy_static! {
     pub static ref SERIAL1: Mutex<SerialPort> = {

src/vga_buffer.rs

@@ -163,9 +163,3 @@ lazy_static! {
     pub static ref WRITER: Mutex<Writer> =
         Mutex::new(Writer::new(ColorCode::new(Color::Yellow, Color::Black)));
 }
-
-#[test_case]
-fn test_println_simple() {
-    println!("Does this work?");
-}
-