* test -> tests.
svn path=/nixos/trunk/; revision=16897
This commit is contained in:
parent
4a0be54df0
commit
921b838149
|
@ -155,6 +155,7 @@ in
|
|||
# installation.
|
||||
installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
|
||||
|
||||
/*
|
||||
boot.postBootCommands =
|
||||
''
|
||||
export PATH=${pkgs.gnutar}/bin:${pkgs.bzip2}/bin:$PATH
|
||||
|
@ -176,6 +177,7 @@ in
|
|||
# running system on the CD/DVD.
|
||||
cp ${dummyConfiguration} /etc/nixos/configuration.nix
|
||||
'';
|
||||
*/
|
||||
|
||||
# Some more help text.
|
||||
services.mingetty.helpLine =
|
||||
|
|
|
@ -606,6 +606,8 @@ in
|
|||
in concatMapStrings f (concatMap (svc: svc.globalEnvVars) allSubservices)
|
||||
}
|
||||
|
||||
env GCOV_PREFIX=/tmp/coverage-data
|
||||
|
||||
env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${concatStringsSep ":" (concatMap (svc: svc.extraServerPath) allSubservices)}
|
||||
|
||||
respawn ${httpd}/bin/httpd -f ${httpdConf} -DNO_DETACH
|
||||
|
|
36
modules/testing/test-instrumentation.nix
Normal file
36
modules/testing/test-instrumentation.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
# This module allows the test driver to connect to the virtual machine
|
||||
# via a root shell attached to port 514.
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
{
|
||||
|
||||
config = {
|
||||
|
||||
jobs = singleton
|
||||
{ name = "backdoor";
|
||||
|
||||
startOn = "network-interfaces";
|
||||
|
||||
preStart =
|
||||
''
|
||||
eval $(cat /proc/cmdline)
|
||||
echo "guest running, will write in $hostTmpDir on host" > /dev/ttyS0
|
||||
touch /hostfs/$hostTmpDir/running
|
||||
'';
|
||||
|
||||
exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh,stderr";
|
||||
};
|
||||
|
||||
boot.postBootCommands =
|
||||
''
|
||||
( eval $(cat /proc/cmdline)
|
||||
mkdir /hostfs/$hostTmpDir/coverage-data
|
||||
ln -s /hostfs/$hostTmpDir/coverage-data /tmp/coverage-data
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
Loading…
Reference in a new issue