michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-05' into post-06

Browse Source
This commit is contained in:
Philipp Oppermann
2020-06-08 11:57:12 +02:00
parent f9446883e2 7846bd0559
commit 8c10bbb096
6 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/basic_boot.rs
View File

@@ -4,7 +4,7 @@
#![test_runner(blog_os::test_runner)]
#![reexport_test_harness_main = "test_main"]
use blog_os::{println, serial_print, serial_println};
use blog_os::println;
use core::panic::PanicInfo;
#[no_mangle] // don't mangle the name of this function
@@ -21,7 +21,5 @@ fn panic(info: &PanicInfo) -> ! {
#[test_case]
fn test_println() {
serial_print!("test_println... ");
println!("test_println output");
serial_println!("[ok]");
}

2
tests/should_panic.rs
View File

@@ -13,7 +13,7 @@ pub extern "C" fn _start() -> ! {
}
fn should_fail() {
serial_print!("should_fail... ");
serial_print!("should_panic::should_fail...\t");
assert_eq!(0, 1);
}