Convert all tests other than LTO

Author: jasoncouture

tests/higher_half.rs

@@ -1,33 +1,10 @@
-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,
-    );
-}
-
-#[test]
-fn should_panic() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_should_panic"),
-        None,
-    );
-}
-
-#[test]
-fn check_boot_info() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_check_boot_info"),
-        None,
-    );
-}
-
-#[test]
-fn verify_higher_half() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_verify_higher_half"),
-        None,
-    );
-}
+use bootloader_test_runner::define_test;
+const BASIC_BOOT_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_basic_boot");
+const SHOULD_PANIC_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_should_panic");
+const CHECK_BOOT_INFO_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_check_boot_info");
+const VERIFY_HIGHER_HALF_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_HIGHER_HALF_verify_higher_half");
+
+define_test!(basic_boot, BASIC_BOOT_KERNEL);
+define_test!(should_panic, SHOULD_PANIC_KERNEL);
+define_test!(check_boot_info, CHECK_BOOT_INFO_KERNEL);
+define_test!(verify_higher_half, VERIFY_HIGHER_HALF_KERNEL);

tests/map_phys_mem.rs

@@ -1,17 +1,6 @@
-use bootloader_test_runner::run_test_kernel;
+use bootloader_test_runner::define_test;
+const CHECK_BOOT_INFO_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_check_boot_info");
+const ACCESS_PHYS_MEM_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_access_phys_mem");
 
-#[test]
-fn check_boot_info() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_check_boot_info"),
-        None,
-    );
-}
-
-#[test]
-fn access_phys_mem() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_MAP_PHYS_MEM_access_phys_mem"),
-        None,
-    );
-}
+define_test!(check_boot_info, CHECK_BOOT_INFO_KERNEL);
+define_test!(access_phys_mem, ACCESS_PHYS_MEM_KERNEL);

tests/pie.rs

@@ -1,21 +1,9 @@
-use bootloader_test_runner::run_test_kernel;
-
-#[test]
-fn basic_boot() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_basic_boot"), None);
-}
-
-#[test]
-fn should_panic() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_should_panic"), None);
-}
-
-#[test]
-fn check_boot_info() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_check_boot_info"), None);
-}
-
-#[test]
-fn global_variable() {
-    run_test_kernel(env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_global_variable"), None);
-}
+use bootloader_test_runner::define_test;
+const BASIC_BOOT_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_basic_boot");
+const SHOULD_PANIC_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_should_panic");
+const CHECK_BOOT_INFO_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_check_boot_info");
+const GLOBAL_VARIABLE_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_PIE_global_variable");
+define_test!(basic_boot, BASIC_BOOT_KERNEL);
+define_test!(should_panic, SHOULD_PANIC_KERNEL);
+define_test!(check_boot_info, CHECK_BOOT_INFO_KERNEL);
+define_test!(global_variable, GLOBAL_VARIABLE_KERNEL);

tests/ramdisk.rs

@@ -1,18 +1,6 @@
-use bootloader_test_runner::run_test_kernel;
+use bootloader_test_runner::define_test;
 static RAMDISK_PATH: &str = "tests/ramdisk.txt";
-
-#[test]
-fn basic_boot() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_basic_boot"),
-        Some(RAMDISK_PATH),
-    );
-}
-
-#[test]
-fn check_ramdisk() {
-    run_test_kernel(
-        env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_ramdisk"),
-        Some(RAMDISK_PATH),
-    );
-}
+static BASIC_BOOT_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_basic_boot");
+static RAMDISK_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_RAMDISK_ramdisk");
+define_test!(basic_boot, BASIC_BOOT_KERNEL, RAMDISK_PATH);
+define_test!(ramdisk, RAMDISK_KERNEL, RAMDISK_PATH);