diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-25 10:21:14 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-25 11:39:17 +0200 |
| commit | fe875b41004bafd898645fe3856420b18c63f3f5 (patch) | |
| tree | dc6f350a6a7b3fa075ae1903a535784055b998a3 /nixos/tests/boot.nix | |
| parent | f78831c8b609084b4b84599edbe222101714c0c5 (diff) | |
| download | nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar.gz nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar.bz2 nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar.lz nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar.xz nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.tar.zst nixlib-fe875b41004bafd898645fe3856420b18c63f3f5.zip | |
nixos/tests/boot.nix: Remove empty module
Diffstat (limited to 'nixos/tests/boot.nix')
| -rw-r--r-- | nixos/tests/boot.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index af7db5aa8164..3ea0df65c8b5 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -12,7 +12,6 @@ let modules = [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix - { key = "serial"; } ]; }).config.system.build.isoImage; @@ -30,20 +29,25 @@ let ''; }; in { + biosCdrom = makeBootTest "bios-cdrom" '' cdrom => glob("${iso}/iso/*.iso") ''; + biosUsb = makeBootTest "bios-usb" '' usb => glob("${iso}/iso/*.iso") ''; + uefiCdrom = makeBootTest "uefi-cdrom" '' cdrom => glob("${iso}/iso/*.iso"), bios => '${pkgs.OVMF}/FV/OVMF.fd' ''; + uefiUsb = makeBootTest "uefi-usb" '' usb => glob("${iso}/iso/*.iso"), bios => '${pkgs.OVMF}/FV/OVMF.fd' ''; + netboot = let config = (import ../lib/eval-config.nix { inherit system; |