From fbb40e0389276556f7282abb6c7452281f7698b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Sep 2013 11:31:09 +0200
Subject: [PATCH] release.nix: Automatically include all of tests/default.nix

---
 release.nix         | 41 +++++++----------------------------------
 tests/default.nix   |  4 ++--
 tests/installer.nix |  2 ++
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/release.nix b/release.nix
index a6b80be0ea6d..6d61b7963597 100644
--- a/release.nix
+++ b/release.nix
@@ -234,41 +234,14 @@ in {
   */
 
 
+  # Run the tests in ./tests/default.nix for each platform.  You can
+  # run a test by doing e.g. "nix-build -A tests.login.x86_64-linux".
   tests =
+    with pkgs.lib;
     let
-      runTest = f: pkgs.lib.genAttrs systems (system:
-        f (import ./tests { inherit system; })
-      );
-    in {
-      avahi = runTest (t: t.avahi.test);
-      bittorrent = runTest (t: t.bittorrent.test);
-      firefox = runTest (t: t.firefox.test);
-      firewall = runTest (t: t.firewall.test);
-      installer.grub1 = runTest (t: t.installer.grub1.test);
-      installer.lvm = runTest (t: t.installer.lvm.test);
-      installer.rebuildCD = runTest (t: t.installer.rebuildCD.test);
-      installer.separateBoot = runTest (t: t.installer.separateBoot.test);
-      installer.simple = runTest (t: t.installer.simple.test);
-      #installer.swraid = runTest (t: t.installer.swraid.test);
-      ipv6 = runTest (t: t.ipv6.test);
-      kde4 = runTest (t: t.kde4.test);
-      login = runTest (t: t.login.test);
-      latestKernel.login = runTest (t: t.latestKernel.login.test);
-      misc = runTest (t: t.misc.test);
-      #mpich = runTest (t: t.mpich.test);
-      mysql = runTest (t: t.mysql.test);
-      mysql_replication = runTest (t: t.mysql_replication.test);
-      nat = runTest (t: t.nat.test);
-      nfs3 = runTest (t: t.nfs3.test);
-      #nfs4 = runTest (t: t.nfs4.test);
-      openssh = runTest (t: t.openssh.test);
-      partition = runTest (t: t.partition.test);
-      proxy = runTest (t: t.proxy.test);
-      quake3 = runTest (t: t.quake3.report);
-      #subversion = runTest (t: t.subversion.report);
-      tomcat = runTest (t: t.tomcat.test);
-      #trac = runTest (t: t.trac.test);
-      xfce = runTest (t: t.xfce.test);
-    };
+      testsFor = system:
+        mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)])
+          (import ./tests { inherit system; });
+    in fold recursiveUpdate {} (map testsFor systems);
 
 }
diff --git a/tests/default.nix b/tests/default.nix
index 0822c93e81ee..a94ad0695106 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -13,12 +13,12 @@ with import ../lib/testing.nix { inherit system minimal; };
   login = makeTest (import ./login.nix {});
   latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
   misc = makeTest (import ./misc.nix);
-  mpich = makeTest (import ./mpich.nix);
+  #mpich = makeTest (import ./mpich.nix);
   mysql = makeTest (import ./mysql.nix);
   mysql_replication = makeTest (import ./mysql-replication.nix);
   nat = makeTest (import ./nat.nix);
   nfs3 = makeTest (import ./nfs.nix { version = 3; });
-  nfs4 = makeTest (import ./nfs.nix { version = 4; });
+  #nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
   portmap = makeTest (import ./portmap.nix);
diff --git a/tests/installer.nix b/tests/installer.nix
index 5c61439248fb..74d1650b2ab1 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -268,6 +268,7 @@ in {
       fileSystems = rootFS;
     };
 
+  /*
   swraid = makeTest
     { createPartitions =
         ''
@@ -300,6 +301,7 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
+  */
 
   # Test a basic install using GRUB 1.
   grub1 = makeTest