From 8564ab7dc15bef9c7a56306d09938ca446c384ec Mon Sep 17 00:00:00 2001 From: Jason Couture Date: Tue, 3 Jan 2023 19:29:44 -0500 Subject: [PATCH] Format with cargo fmt --- tests/default_settings.rs | 9 +++++++-- tests/higher_half.rs | 3 ++- tests/map_phys_mem.rs | 6 ++++-- tests/ramdisk.rs | 2 +- tests/runner/src/lib.rs | 38 ++++++++++++++++++++------------------ 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/tests/default_settings.rs b/tests/default_settings.rs index f07bbefe..622592ba 100644 --- a/tests/default_settings.rs +++ b/tests/default_settings.rs @@ -1,9 +1,14 @@ use bootloader_test_runner::define_test; const BASIC_BOOT_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_basic_boot"); const SHOULD_PANIC_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_should_panic"); -const CHECK_BOOT_INFO_KERNEL: &str = env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_check_boot_info"); +const CHECK_BOOT_INFO_KERNEL: &str = + env!("CARGO_BIN_FILE_TEST_KERNEL_DEFAULT_SETTINGS_check_boot_info"); 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!(disable_default_ramdisk_macro_test, BASIC_BOOT_KERNEL, without_ramdisk_tests); +define_test!( + disable_default_ramdisk_macro_test, + BASIC_BOOT_KERNEL, + without_ramdisk_tests +); diff --git a/tests/higher_half.rs b/tests/higher_half.rs index 0782a527..899df7b8 100644 --- a/tests/higher_half.rs +++ b/tests/higher_half.rs @@ -2,7 +2,8 @@ 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"); +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); diff --git a/tests/map_phys_mem.rs b/tests/map_phys_mem.rs index 4f106e5c..0ac9a63c 100644 --- a/tests/map_phys_mem.rs +++ b/tests/map_phys_mem.rs @@ -1,6 +1,8 @@ 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"); +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"); define_test!(check_boot_info, CHECK_BOOT_INFO_KERNEL); define_test!(access_phys_mem, ACCESS_PHYS_MEM_KERNEL); diff --git a/tests/ramdisk.rs b/tests/ramdisk.rs index ac8f2862..8f94b20e 100644 --- a/tests/ramdisk.rs +++ b/tests/ramdisk.rs @@ -3,4 +3,4 @@ static RAMDISK_PATH: &str = "tests/ramdisk.txt"; 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); \ No newline at end of file +define_test!(ramdisk, RAMDISK_KERNEL, RAMDISK_PATH); diff --git a/tests/runner/src/lib.rs b/tests/runner/src/lib.rs index fb34fc1a..67665032 100644 --- a/tests/runner/src/lib.rs +++ b/tests/runner/src/lib.rs @@ -1,11 +1,15 @@ -use std::{io::Write, path::{Path, PathBuf}, process::Command}; +use std::{ + io::Write, + path::{Path, PathBuf}, + process::Command, +}; pub extern crate lazy_static; pub extern crate paste; #[doc(hidden)] -pub use paste::paste; -#[doc(hidden)] pub use lazy_static::lazy_static; +#[doc(hidden)] +pub use paste::paste; use rand::Rng; const QEMU_ARGS: &[&str] = &[ @@ -20,10 +24,10 @@ const QEMU_ARGS: &[&str] = &[ pub fn generate_test_image_filename(path: &Path) -> PathBuf { let s: String = rand::thread_rng() - .sample_iter(&rand::distributions::Alphanumeric) - .take(8) - .map(char::from) - .collect(); + .sample_iter(&rand::distributions::Alphanumeric) + .take(8) + .map(char::from) + .collect(); path.with_file_name(s) } @@ -66,7 +70,6 @@ pub fn run_test_kernel_uefi(kernel_binary_path: &str, ramdisk_path: Option<&str> uefi_builder.create_disk_image(&gpt_path).unwrap(); - run_test_kernel_on_uefi(&gpt_path); } @@ -76,7 +79,6 @@ pub fn run_test_kernel(kernel_binary_path: &str, ramdisk_path: Option<&str>) { run_test_kernel_tftp(kernel_binary_path, ramdisk_path); } - pub fn run_test_kernel_tftp(kernel_binary_path: &str, ramdisk_path: Option<&str>) { let kernel_path = Path::new(kernel_binary_path); let ramdisk_path = match ramdisk_path { @@ -171,12 +173,12 @@ pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) { #[macro_export] /// Creates a series of test functions for a given kernel image to cover bios, uefi, and tftp -/// +/// /// define_test!(name, kernel) will generate all 3 tests, with a ramdisk and no-ramdisk variant. /// define_test!(name, kernel, ramdisk) will generate all 3 tests, with the specified ramdisk /// define_test!(name, kernel, without_ramdisk_tests) will generate all 3 tests, with only the no-ramdisk variant - macro_rules! define_test { - ($test_name: ident, $bin: tt) => ( +macro_rules! define_test { + ($test_name: ident, $bin: tt) => { $crate::paste! { #[test] fn [< $test_name _uefi_without_ramdisk >]() { @@ -227,8 +229,8 @@ pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) { ); } } - ); - ($test_name: ident, $bin:tt, without_ramdisk_tests) => ( + }; + ($test_name: ident, $bin:tt, without_ramdisk_tests) => { $crate::paste! { #[test] fn [< $test_name _uefi_without_ramdisk >]() { @@ -254,8 +256,8 @@ pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) { ); } } - ); - ($test_name: ident, $bin: tt, $ramdisk: tt) => ( + }; + ($test_name: ident, $bin: tt, $ramdisk: tt) => { $crate::paste! { #[test] fn [< $test_name _uefi_with_ramdisk >]() { @@ -281,5 +283,5 @@ pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) { ); } } - ); -} \ No newline at end of file + }; +}