Skip to content

Commit c2cc7ba

Browse files
committed
Remove test debugging changes.
1 parent fa7b227 commit c2cc7ba

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

tests/default_settings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use bootloader_test_runner::run_test_kernel;
44
fn basic_boot() {
55
run_test_kernel(
66
env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"),
7-
Some("tests/ramdisk.txt"),
7+
None
88
);
99
}
1010

uefi/src/main.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,14 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
7272
unsafe {
7373
*SYSTEM_TABLE.get() = Some(st.unsafe_clone());
7474
}
75-
let stdout = unsafe { &mut *SYSTEM_TABLE.get() };
76-
let stdout = stdout.as_mut().unwrap();
77-
let stdout = stdout.stdout();
78-
stdout.clear().unwrap();
79-
writeln!(stdout, "UEFI bootloader started; trying to load kernel").unwrap();
75+
st.stdout().clear().unwrap();
76+
writeln!(st.stdout(), "UEFI bootloader started; trying to load kernel").unwrap();
8077

8178
let mut boot_mode = BootMode::Disk;
8279
let mut kernel = load_kernel(image, &mut st, boot_mode);
8380
if kernel.is_none() {
8481
writeln!(
85-
stdout,
82+
st.stdout(),
8683
"Failed to load kernel via {:?}, trying TFTP",
8784
boot_mode
8885
)
@@ -92,12 +89,12 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
9289
kernel = load_kernel(image, &mut st, boot_mode);
9390
}
9491
let kernel = kernel.expect("Failed to load kernel");
95-
writeln!(stdout, "Trying to load ramdisk via {:?}", boot_mode).unwrap();
92+
writeln!(st.stdout(), "Trying to load ramdisk via {:?}", boot_mode).unwrap();
9693
// Ramdisk must load from same source, or not at all.
9794
let ramdisk = load_ramdisk(image, &mut st, boot_mode);
9895

9996
writeln!(
100-
stdout,
97+
st.stdout(),
10198
"{}",
10299
match ramdisk {
103100
Some(_) => "Loaded ramdisk",

0 commit comments

Comments
 (0)