Simplify test function

Author: phil-opp

tests/default_settings.rs

@@ -2,24 +2,21 @@ use bootloader_test_runner::run_test_kernel;
 
 #[test]
 fn basic_boot() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"
+    ));
 }
 
 #[test]
 fn should_panic() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_should_panic"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_should_panic"
+    ));
 }
 
 #[test]
 fn check_boot_info() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_check_boot_info"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_check_boot_info"
+    ));
 }

tests/higher_half.rs

@@ -2,32 +2,24 @@ use bootloader_test_runner::run_test_kernel;
 
 #[test]
 fn basic_boot() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_basic_boot"),
-        None,
-    );
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_basic_boot"));
 }
 
 #[test]
 fn should_panic() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_should_panic"),
-        None,
-    );
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_should_panic"));
 }
 
 #[test]
 fn check_boot_info() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_check_boot_info"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_check_boot_info"
+    ));
 }
 
 #[test]
 fn verify_higher_half() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_verify_higher_half"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_verify_higher_half"
+    ));
 }

tests/lto.rs

@@ -21,5 +21,5 @@ fn basic_boot() {
         .join("basic_boot");
     assert!(kernel_path.exists());
 
-    run_test_kernel(kernel_path.as_path().to_str().unwrap(), None);
+    run_test_kernel(kernel_path.as_path().to_str().unwrap());
 }

tests/map_phys_mem.rs

@@ -2,16 +2,14 @@ use bootloader_test_runner::run_test_kernel;
 
 #[test]
 fn check_boot_info() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_check_boot_info"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_check_boot_info"
+    ));
 }
 
 #[test]
 fn access_phys_mem() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_access_phys_mem"),
-        None,
-    );
+    run_test_kernel(env!(
+        "CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_access_phys_mem"
+    ));
 }

tests/pie.rs

@@ -2,20 +2,20 @@ use bootloader_test_runner::run_test_kernel;
 
 #[test]
 fn basic_boot() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_basic_boot"), None);
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_basic_boot"));
 }
 
 #[test]
 fn should_panic() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_should_panic"), None);
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_should_panic"));
 }
 
 #[test]
 fn check_boot_info() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_check_boot_info"), None);
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_check_boot_info"));
 }
 
 #[test]
 fn global_variable() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_global_variable"), None);
+    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_global_variable"));
 }

tests/ramdisk.rs

@@ -1,20 +1,20 @@
 use std::path::Path;
 
-use bootloader_test_runner::run_test_kernel;
+use bootloader_test_runner::run_test_kernel_with_ramdisk;
 static RAMDISK_PATH: &str = "tests/ramdisk.txt";
 
 #[test]
 fn basic_boot() {
-    run_test_kernel(
+    run_test_kernel_with_ramdisk(
         env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_basic_boot"),
-        Some(&Path::new(RAMDISK_PATH)),
+        Some(Path::new(RAMDISK_PATH)),
     );
 }
 
 #[test]
 fn check_ramdisk() {
-    run_test_kernel(
+    run_test_kernel_with_ramdisk(
         env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_ramdisk"),
-        Some(&Path::new(RAMDISK_PATH)),
+        Some(Path::new(RAMDISK_PATH)),
     );
 }

tests/runner/src/lib.rs

@@ -10,7 +10,11 @@ const QEMU_ARGS: &[&str] = &[
     "--no-reboot",
 ];
 
-pub fn run_test_kernel(kernel_binary_path: &str, ramdisk_path: Option<&Path>) {
+pub fn run_test_kernel(kernel_binary_path: &str) {
+    run_test_kernel_with_ramdisk(kernel_binary_path, None)
+}
+
+pub fn run_test_kernel_with_ramdisk(kernel_binary_path: &str, ramdisk_path: Option<&Path>) {
     let kernel_path = Path::new(kernel_binary_path);
 
     // create an MBR disk image for legacy BIOS booting