nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Rename apply' and call'.

Browse Source 
svn path=/nixos/trunk/; revision=21944
This commit is contained in:
Eelco Dolstra 2010-05-23 12:02:54 +00:00
parent 07df264e0c
commit fa89713c78
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/testing.nix
View File

@ -84,10 +84,11 @@ rec {
''; # */ ''; # */
# !!! Rename these functions to something more sensible. makeTest = testFun: complete (call testFun);
call = f: f { inherit pkgs nixpkgs system; }; makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun);
apply = testFun: complete (call testFun); apply = makeTest; # compatibility
call = f: f { inherit pkgs nixpkgs system; };
complete = t: t // rec { complete = t: t // rec {
nodes = nodes =
@ -173,10 +174,10 @@ rec {
runInMachine ({ runInMachine ({
machine = client; machine = client;
preBuild = '' preBuild = ''
$client->waitForX ; $client->waitForX;
'' ; '' ;
} // args ); } // args );
simpleTest = as: (apply ({ ... }: as)).test; simpleTest = as: (makeTest ({ ... }: as)).test;
} }

24
tests/default.nix
View File

@ -6,16 +6,16 @@
with import ../lib/testing.nix { inherit nixpkgs services system; }; with import ../lib/testing.nix { inherit nixpkgs services system; };
{ {
bittorrent = apply (import ./bittorrent.nix); bittorrent = makeTest (import ./bittorrent.nix);
firefox = apply (import ./firefox.nix); firefox = makeTest (import ./firefox.nix);
installer = pkgs.lib.mapAttrs (name: complete) (call (import ./installer.nix)); installer = makeTests (import ./installer.nix);
kde4 = apply (import ./kde4.nix); kde4 = makeTest (import ./kde4.nix);
login = apply (import ./login.nix); login = makeTest (import ./login.nix);
nat = apply (import ./nat.nix); nat = makeTest (import ./nat.nix);
openssh = apply (import ./openssh.nix); openssh = makeTest (import ./openssh.nix);
portmap = apply (import ./portmap.nix); portmap = makeTest (import ./portmap.nix);
proxy = apply (import ./proxy.nix); proxy = makeTest (import ./proxy.nix);
quake3 = apply (import ./quake3.nix); quake3 = makeTest (import ./quake3.nix);
subversion = apply (import ./subversion.nix); subversion = makeTest (import ./subversion.nix);
trac = apply (import ./trac.nix); trac = makeTest (import ./trac.nix);
} }