Allow running tests only with uefi or bios

Author: phil-opp

Cargo.toml

@@ -39,8 +39,8 @@ bootloader-x86_64-bios-common = { version = "0.11.0", path = "bios/common" }
 
 [features]
 default = ["bios", "uefi"]
-bios = ["mbrman"]
-uefi = ["gpt"]
+bios = ["mbrman", "bootloader_test_runner/bios"]
+uefi = ["gpt", "bootloader_test_runner/uefi"]
 
 [dependencies]
 anyhow = "1.0.32"

tests/runner/Cargo.toml

@@ -6,7 +6,11 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+bios = ["bootloader/bios"]
+uefi = ["bootloader/uefi", "ovmf-prebuilt"]
+
 [dependencies]
-bootloader = { path = "../.." }
+bootloader = { path = "../..", default-features = false }
 strip-ansi-escapes = "0.1.1"
-ovmf-prebuilt = "0.1.0-alpha.1"
+ovmf-prebuilt = { version = "0.1.0-alpha.1", optional = true }

tests/runner/src/lib.rs

@@ -13,27 +13,35 @@ const QEMU_ARGS: &[&str] = &[
 pub fn run_test_kernel(kernel_binary_path: &str) {
     let kernel_path = Path::new(kernel_binary_path);
 
-    // create an MBR disk image for legacy BIOS booting
-    let mbr_path = kernel_path.with_extension("mbr");
-    bootloader::BiosBoot::new(kernel_path)
-        .create_disk_image(&mbr_path)
-        .unwrap();
+    #[cfg(feature = "uefi")]
+    {
+        // create a GPT disk image for UEFI booting
+        let gpt_path = kernel_path.with_extension("gpt");
+        let uefi_builder = bootloader::UefiBoot::new(kernel_path);
+        uefi_builder.create_disk_image(&gpt_path).unwrap();
+
+        // create a TFTP folder with the kernel executable and UEFI bootloader for
+        // UEFI PXE booting
+        let tftp_path = kernel_path.with_extension(".tftp");
+        uefi_builder.create_pxe_tftp_folder(&tftp_path).unwrap();
 
-    // create a GPT disk image for UEFI booting
-    let gpt_path = kernel_path.with_extension("gpt");
-    let uefi_builder = bootloader::UefiBoot::new(kernel_path);
-    uefi_builder.create_disk_image(&gpt_path).unwrap();
+        run_test_kernel_on_uefi(&gpt_path);
+        run_test_kernel_on_uefi_pxe(&tftp_path);
+    }
 
-    // create a TFTP folder with the kernel executable and UEFI bootloader for
-    // UEFI PXE booting
-    let tftp_path = kernel_path.with_extension(".tftp");
-    uefi_builder.create_pxe_tftp_folder(&tftp_path).unwrap();
+    #[cfg(feature = "bios")]
+    {
+        // create an MBR disk image for legacy BIOS booting
+        let mbr_path = kernel_path.with_extension("mbr");
+        bootloader::BiosBoot::new(kernel_path)
+            .create_disk_image(&mbr_path)
+            .unwrap();
 
-    run_test_kernel_on_uefi(&gpt_path);
-    run_test_kernel_on_bios(&mbr_path);
-    run_test_kernel_on_uefi_pxe(&tftp_path);
+        run_test_kernel_on_bios(&mbr_path);
+    }
 }
 
+#[cfg(feature = "uefi")]
 pub fn run_test_kernel_on_uefi(out_gpt_path: &Path) {
     let mut run_cmd = Command::new("qemu-system-x86_64");
     run_cmd
@@ -57,6 +65,7 @@ pub fn run_test_kernel_on_uefi(out_gpt_path: &Path) {
     }
 }
 
+#[cfg(feature = "bios")]
 pub fn run_test_kernel_on_bios(out_mbr_path: &Path) {
     let mut run_cmd = Command::new("qemu-system-x86_64");
     run_cmd
@@ -79,6 +88,7 @@ pub fn run_test_kernel_on_bios(out_mbr_path: &Path) {
     }
 }
 
+#[cfg(feature = "uefi")]
 pub fn run_test_kernel_on_uefi_pxe(out_tftp_path: &Path) {
     let mut run_cmd = Command::new("qemu-system-x86_64");
     run_cmd.arg("-netdev").arg(format!(