Add a runner-test kernel for testing new runner functionality

Author: phil-opp

azure-pipelines.yml

@@ -199,6 +199,10 @@ jobs:
     workingDirectory: example-kernels/runner
     displayName: 'Run `cargo xrun` for "runner" kernel'
 
+  - script: cargo xtest
+    workingDirectory: example-kernels/runner-test
+    displayName: 'Run `cargo xtest` for "runner-test" kernel'
+
 - job: formatting
   displayName: Check Formatting
 

example-kernels/Cargo.lock

@@ -4,6 +4,7 @@ members = [
     "default-target-bootimage",
     "default-target-cargo",
     "runner",
+    "runner-test",
     "testing-qemu-exit-code",
     "testing-serial-result",
 ]

example-kernels/Cargo.toml

@@ -0,0 +1,5 @@
+[build]
+target = "../x86_64-bootimage-example-kernels.json"
+
+[target.'cfg(target_os = "none")']
+runner = "bootimage runner"

example-kernels/runner-test/.cargo/config

@@ -0,0 +1,2 @@
+/target/
+**/*.rs.bk

example-kernels/runner-test/.gitignore

@@ -0,0 +1,17 @@
+[package]
+name = "runner-test"
+version = "0.1.0"
+authors = ["Philipp Oppermann <[email protected]>"]
+edition = "2018"
+
+[[test]]
+name = "no-harness"
+harness = false
+
+[dependencies]
+bootloader = "0.5.1"
+x86_64 = "0.5.3"
+
+[package.metadata.bootimage]
+test-success-exit-code = 33 # (0x10 << 1) | 1
+test-args = ["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04", "-display", "none"]

example-kernels/runner-test/Cargo.toml

@@ -0,0 +1,63 @@
+#![no_std]
+#![cfg_attr(test, no_main)]
+
+#![feature(custom_test_frameworks)]
+#![test_runner(crate::test_runner)]
+#![reexport_test_harness_main = "test_main"]
+
+pub fn test_runner(tests: &[&dyn Fn()]) {
+    for test in tests.iter() {
+        test();
+    }
+
+    unsafe { exit_qemu(ExitCode::Success); }
+}
+
+#[test_case]
+fn test1() {
+    assert_eq!(0, 0);
+}
+
+#[test_case]
+fn test2() {
+    assert_eq!(1, 1);
+}
+
+pub enum ExitCode {
+    Success,
+    Failed
+}
+
+impl ExitCode {
+    fn code(&self) -> u32 {
+        match self {
+            ExitCode::Success => 0x10,
+            ExitCode::Failed => 0x11,
+        }
+    }
+}
+
+/// exit QEMU (see https://os.phil-opp.com/integration-tests/#shutting-down-qemu)
+pub unsafe fn exit_qemu(exit_code: ExitCode) {
+    use x86_64::instructions::port::Port;
+
+    let mut port = Port::<u32>::new(0xf4);
+    port.write(exit_code.code());
+}
+
+#[cfg(test)]
+#[no_mangle]
+pub extern "C" fn _start() -> ! {
+    test_main();
+
+    unsafe { exit_qemu(ExitCode::Failed); }
+
+    loop {}
+}
+
+#[cfg(test)]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    unsafe { exit_qemu(ExitCode::Failed); }
+    loop {}
+}

example-kernels/runner-test/src/lib.rs

@@ -0,0 +1,30 @@
+#![no_std]
+#![no_main]
+
+#![feature(custom_test_frameworks)]
+#![test_runner(runner_test::test_runner)]
+#![reexport_test_harness_main = "test_main"]
+
+use core::panic::PanicInfo;
+use runner_test::{exit_qemu, ExitCode};
+
+#[no_mangle]
+pub extern "C" fn _start() -> ! {
+    #[cfg(test)]
+    test_main();
+
+    unsafe { exit_qemu(ExitCode::Failed); }
+
+    loop {}
+}
+
+#[test_case]
+fn test1() {
+    assert_eq!(0, 0);
+}
+
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    unsafe { exit_qemu(ExitCode::Failed); }
+    loop {}
+}

example-kernels/runner-test/src/main.rs

@@ -0,0 +1,21 @@
+#![no_std]
+#![no_main]
+
+use runner_test::{exit_qemu, ExitCode};
+use core::panic::PanicInfo;
+
+#[no_mangle]
+pub extern "C" fn _start() -> ! {
+    unsafe {
+        exit_qemu(ExitCode::Success);
+    }
+    loop {}
+}
+
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    unsafe {
+        exit_qemu(ExitCode::Failed);
+    }
+    loop {}
+}

example-kernels/runner-test/tests/no-harness.rs

@@ -0,0 +1,35 @@
+#![no_std] // don't link the Rust standard library
+#![no_main] // disable all Rust-level entry points
+
+#![feature(custom_test_frameworks)]
+#![test_runner(crate::test_runner)]
+#![reexport_test_harness_main = "test_main"]
+
+use core::panic::PanicInfo;
+use runner_test::{exit_qemu, ExitCode};
+
+#[no_mangle] // don't mangle the name of this function
+pub extern "C" fn _start() -> ! {
+    test_main();
+
+    unsafe { exit_qemu(ExitCode::Failed); }
+
+    loop {}
+}
+
+pub fn test_runner(tests: &[&dyn Fn()]) {
+    for test in tests.iter() {
+        test();
+    }
+}
+
+#[test_case]
+fn should_panic() {
+    assert_eq!(1, 2);
+}
+
+#[panic_handler]
+fn panic(_info: &PanicInfo) -> ! {
+    unsafe { exit_qemu(ExitCode::Success); }
+    loop {}
+}