ci.nix

@@ -70,7 +70,4 @@ let
           '';
       };
     };
-in jobs //
-   {
-     all = pkgs.lib.collect pkgs.lib.isDerivation jobs;
-   }
+in  (genAttrs devices for-device) # tests # jobs

doc/development.rst

@@ -232,13 +232,18 @@ Running tests
 *************
 
 You can run all of the tests by evaluating :file:`ci.nix`, which is the
-input I use in Hydra. 
+input I use in Hydra. Note that it expects Nixpkgs stable `and` unstable
+as inputs, because it builds the qemu device against both.
 
 .. code-block:: console
 
-    nix-build -I liminix=`pwd`  ci.nix -A pppoe # run one job
-    nix-build -I liminix=`pwd`  ci.nix -A all # run all jobs
-    
+    nix-build --argstr liminix `pwd`  --arg  nixpkgs "<nixpkgs>" \
+     --argstr unstable `pwd`/../unstable-nixpkgs/ ci.nix
+
+To run a single named test, use the ``-A`` flag. For example, ``-A pppoe``
+
+
+
 
 Troubleshooting
 ***************

tests/ci.nix

@@ -1,13 +1,13 @@
 {
-  ext4 = import ./ext4/test.nix;
-  fennel = import ./fennel/test.nix;
-  inout = import ./inout/test.nix;
-  jffs2 = import ./jffs2/test.nix;
-  min-copy-closure = import ./min-copy-closure/test.nix;
-  pppoe = import ./pppoe/test.nix;
-  pseudofiles = import ./pseudofiles/test.nix;
   smoke = import ./smoke/test.nix;
+  pseudofiles = import ./pseudofiles/test.nix;
+  wlan = import ./wlan/test.nix;
+  pppoe = import ./pppoe/test.nix;
+  jffs2 = import ./jffs2/test.nix;
+  ext4 = import ./ext4/test.nix;
+  min-copy-closure = import ./min-copy-closure/test.nix;
+  fennel = import ./fennel/test.nix;
   tftpboot = import ./tftpboot/test.nix;
   updown = import ./updown/test.nix;
-  wlan = import ./wlan/test.nix;
+  inout = import ./inout/test.nix;
 }

tests/inout/script.expect

@@ -35,7 +35,7 @@ if { $when eq "early" } {
 
 expect "BusyBox"
 chat "#" "PS1=RE\\ADY_\\ ; stty -echo \r"
-chat "READY_"  "tail -f /run/log/current & \rs6-rc -b  -a list\r"
+chat "READY_"  "tail -f /run/uncaught-logs/current & \rs6-rc -b  -a list\r"
 
 chat "mount" "\r"
 

tests/pseudofiles/test.nix

@@ -1,9 +1,9 @@
 let
   overlay = import <liminix/overlay.nix>;
-  pkgs = import <nixpkgs> { overlays = [overlay]; };
-  fixture = pkgs.callPackage ./fixture.nix {};
-in pkgs.runCommand "check" {
-    nativeBuildInputs = with pkgs; [ squashfsTools qprint ] ;
+  nixpkgs = import <nixpkgs> { overlays = [overlay]; };
+  fixture = nixpkgs.callPackage ./fixture.nix {};
+in nixpkgs.runCommand "check" {
+    nativeBuildInputs = with <nixpkgs>; [ squashfsTools qprint ] ;
   } ''
 set -e
 diff ${fixture} ${./result.expected}