From 9fcfcbbf16d05d294aadb9b88db0f004ba802bea Mon Sep 17 00:00:00 2001 From: NatrixAeria Date: Thu, 15 Apr 2021 22:52:47 +0200 Subject: Rewrite a memory safe vga text buffer --- kernel/src/testing/runner.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'kernel/src/testing/runner.rs') diff --git a/kernel/src/testing/runner.rs b/kernel/src/testing/runner.rs index 38d6d94..63b4013 100644 --- a/kernel/src/testing/runner.rs +++ b/kernel/src/testing/runner.rs @@ -1,8 +1,7 @@ -use crate::io::{qemu, serial, vga_text}; +use crate::io::{qemu, serial}; use core::fmt::Write; use qemu::{exit_qemu, QemuExitCode}; use serial::SerialStream; -use vga_text::OStream; pub fn serial_test_runner_panic(tests: &[&dyn Fn()]) { let mut stdout = SerialStream::new(); @@ -26,22 +25,25 @@ pub fn serial_test_runner(tests: &[&dyn Fn()]) { } pub fn test_runner_panic(tests: &[&dyn Fn()]) { - let mut stdout = OStream::new(); - write!(stdout, "\nRunning {} tests\n", tests.len()).unwrap(); + crate::vga_println!(); + crate::vga_println!("Running {} tests", tests.len()); for test in tests { test(); - write!(stdout, "\n[test did not panic]\n\n").unwrap(); + crate::vga_println!(); + crate::vga_println!("[test did not panic]"); + crate::vga_println!(); exit_qemu(QemuExitCode::Failed); } exit_qemu(QemuExitCode::Success); } pub fn test_runner(tests: &[&dyn Fn()]) { - let mut stdout = OStream::new(); - write!(stdout, "\nRunning {} tests\n", tests.len()).unwrap(); + crate::vga_println!(); + crate::vga_println!("Running {} tests", tests.len()); for test in tests { test(); - write!(stdout, "\n[OK]\n").unwrap(); + crate::vga_println!(); + crate::vga_println!("[OK]"); } exit_qemu(QemuExitCode::Success); } -- cgit v1.2.3-54-g00ecf