about summary refs log tree commit diff
path: root/nixos/release.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2014-05-01 20:21:02 -0500
committerWilliam A. Kennington III <william@wkennington.com>2014-08-28 13:35:35 -0700
commit5870ae613f42c99456dcbbc4df01abdce3c1f448 (patch)
tree6b0fc7e7fcabc19b2fce2dcbd23be07eac1e9bbf /nixos/release.nix
parent769d2dc6bf7bba3867e13c125fc0a6d5c76aa19a (diff)
nixos/release: Dynamically generate installer tests
Diffstat (limited to 'nixos/release.nix')
-rw-r--r--nixos/release.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index 0620b46d46ad4..e5a4e7337ab0a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -222,12 +222,11 @@ in rec {
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
-  tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
-  tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
-  tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
-  tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
-  tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
-  tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+  tests.installer = with pkgs.lib;
+    let installer = import tests/installer.nix; in
+    flip mapAttrs (installer { }) (name: _:
+      forAllSystems (system: (installer { system = system; }).${name}.test)
+    );
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};