Skip to content

Commit d18076e

Browse files
rust-osdev#360: Resolve @phil-opp's concerns (3/5 + 4/5)
1 parent ec7cbaa commit d18076e

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

tests/runner/src/lib.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@ use bootloader::BootConfig;
22
use bootloader::DiskImageBuilder;
33
use std::{io::Read, path::Path, process::Command};
44

5-
#[allow(dead_code)]
6-
const QEMU_ARGS: &[&str] = &[
7-
"-device",
8-
"isa-debug-exit,iobase=0xf4,iosize=0x04",
9-
"-serial",
10-
"stdio",
11-
"-display",
12-
"none",
13-
"--no-reboot",
14-
];
15-
16-
#[allow(dead_code)]
17-
const SEPARATOR: &str = "\n____________________________________\n";
18-
195
pub fn run_test_kernel(kernel_binary_path: &str) {
206
run_test_kernel_internal(kernel_binary_path, None, None)
217
}
@@ -106,6 +92,18 @@ fn run_qemu<'a, A>(args: A)
10692
where
10793
A: IntoIterator<Item = &'a str>,
10894
{
95+
const QEMU_ARGS: &[&str] = &[
96+
"-device",
97+
"isa-debug-exit,iobase=0xf4,iosize=0x04",
98+
"-serial",
99+
"stdio",
100+
"-display",
101+
"none",
102+
"--no-reboot",
103+
];
104+
105+
const SEPARATOR: &str = "\n____________________________________\n";
106+
109107
use std::process::Stdio;
110108

111109
let mut run_cmd = Command::new("qemu-system-x86_64");

0 commit comments

Comments
 (0)