From 472aff23b7804d0ec5bd471aec166f686d8aa18d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 2 Oct 2013 13:25:51 +0200 Subject: [PATCH] Move run-in-machine test to a different place, because it does not conform to the other testcases' interface --- release.nix | 4 +++- tests/default.nix | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index ef5d9f4923d..63488d712bb 100644 --- a/release.nix +++ b/release.nix @@ -243,5 +243,7 @@ in { mapAttrsRecursiveCond (x: !x ? test) (n: v: listToAttrs [(nameValuePair system v.test)]) (import ./tests { inherit nixpkgs system; }); in fold recursiveUpdate {} (map testsFor systems); - + + + run-in-machine-tests = pkgs.lib.genAttrs systems (system: import ./tests/run-in-machine.nix { inherit nixpkgs system; }); } diff --git a/tests/default.nix b/tests/default.nix index 35c03a3b708..1a50d8e7e67 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -33,5 +33,4 @@ with import ../lib/testing.nix { inherit system minimal; }; tomcat = makeTest (import ./tomcat.nix); trac = makeTest (import ./trac.nix); xfce = makeTest (import ./xfce.nix); - run-in-machine = import ./run-in-machine.nix { inherit nixpkgs system; }; }