2016-03-29 15:16:01 +02:00
|
|
|
{ system, minimal ? false, config ? {} }:
|
2010-01-05 12:18:43 +01:00
|
|
|
|
2016-03-29 15:16:01 +02:00
|
|
|
with import ./build-vms.nix { inherit system minimal config; };
|
2010-01-05 12:18:43 +01:00
|
|
|
with pkgs;
|
|
|
|
|
2018-02-27 13:07:35 +01:00
|
|
|
let
|
|
|
|
jquery-ui = callPackage ./testing/jquery-ui.nix { };
|
|
|
|
jquery = callPackage ./testing/jquery.nix { };
|
|
|
|
|
|
|
|
in rec {
|
2010-01-05 12:18:43 +01:00
|
|
|
|
2010-03-09 11:14:45 +01:00
|
|
|
inherit pkgs;
|
|
|
|
|
2010-01-05 12:18:43 +01:00
|
|
|
|
2010-12-16 16:54:15 +01:00
|
|
|
testDriver = stdenv.mkDerivation {
|
|
|
|
name = "nixos-test-driver";
|
2011-01-05 15:04:38 +01:00
|
|
|
|
|
|
|
buildInputs = [ makeWrapper perl ];
|
|
|
|
|
|
|
|
unpackPhase = "true";
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2015-08-26 15:04:27 +02:00
|
|
|
preferLocalBuild = true;
|
|
|
|
|
2011-01-05 15:04:38 +01:00
|
|
|
installPhase =
|
2010-12-16 16:54:15 +01:00
|
|
|
''
|
|
|
|
mkdir -p $out/bin
|
|
|
|
cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
|
|
|
|
chmod u+x $out/bin/nixos-test-driver
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2010-12-16 16:54:15 +01:00
|
|
|
libDir=$out/lib/perl5/site_perl
|
|
|
|
mkdir -p $libDir
|
|
|
|
cp ${./test-driver/Machine.pm} $libDir/Machine.pm
|
2011-01-06 18:28:35 +01:00
|
|
|
cp ${./test-driver/Logger.pm} $libDir/Logger.pm
|
2010-12-16 16:54:15 +01:00
|
|
|
|
2011-01-05 15:04:38 +01:00
|
|
|
wrapProgram $out/bin/nixos-test-driver \
|
2018-02-11 21:38:35 +01:00
|
|
|
--prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
|
2015-08-11 11:52:13 +02:00
|
|
|
--prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
|
2010-12-16 16:54:15 +01:00
|
|
|
'';
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2010-01-05 12:18:43 +01:00
|
|
|
# Run an automated test suite in the given virtual network.
|
2011-01-12 19:47:23 +01:00
|
|
|
# `driver' is the script that runs the network.
|
|
|
|
runTests = driver:
|
2010-01-05 12:18:43 +01:00
|
|
|
stdenv.mkDerivation {
|
2014-06-25 12:45:52 +02:00
|
|
|
name = "vm-test-run-${driver.testName}";
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2013-09-02 11:17:50 +02:00
|
|
|
requiredSystemFeatures = [ "kvm" "nixos-test" ];
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2014-09-24 23:48:31 +02:00
|
|
|
buildInputs = [ libxslt ];
|
2010-08-30 01:24:54 +02:00
|
|
|
|
2010-01-05 12:18:43 +01:00
|
|
|
buildCommand =
|
|
|
|
''
|
2011-01-09 23:21:22 +01:00
|
|
|
mkdir -p $out/nix-support
|
2010-12-16 16:54:15 +01:00
|
|
|
|
2015-04-10 11:17:29 +02:00
|
|
|
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
|
2010-01-05 12:18:43 +01:00
|
|
|
|
2011-09-14 20:20:50 +02:00
|
|
|
# Generate a pretty-printed log.
|
2011-01-09 18:58:52 +01:00
|
|
|
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
|
|
|
|
ln -s ${./test-driver/logfile.css} $out/logfile.css
|
|
|
|
ln -s ${./test-driver/treebits.js} $out/treebits.js
|
2014-09-07 15:37:16 +02:00
|
|
|
ln -s ${jquery}/js/jquery.min.js $out/
|
|
|
|
ln -s ${jquery-ui}/js/jquery-ui.min.js $out/
|
2011-01-09 18:58:52 +01:00
|
|
|
|
2010-01-07 17:50:26 +01:00
|
|
|
touch $out/nix-support/hydra-build-products
|
2011-01-09 19:46:02 +01:00
|
|
|
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
|
2011-01-09 19:56:11 +01:00
|
|
|
|
2011-08-09 16:07:44 +02:00
|
|
|
for i in */xchg/coverage-data; do
|
2011-01-09 23:21:22 +01:00
|
|
|
mkdir -p $out/coverage-data
|
2011-08-09 16:07:44 +02:00
|
|
|
mv $i $out/coverage-data/$(dirname $(dirname $i))
|
2011-01-09 19:56:11 +01:00
|
|
|
done
|
dovecot, opensmtpd: add link to test in `meta.tests`
Rationale
---------
Currently, tests are hard to discover. For instance, someone updating
`dovecot` might not notice that the interaction of `dovecot` with
`opensmtpd` is handled in the `opensmtpd.nix` test.
And even for someone updating `opensmtpd`, it requires manual work to go
check in `nixos/tests` whether there is actually a test, especially
given not so many packages in `nixpkgs` have tests and this is thus most
of the time useless.
Finally, for the reviewer, it is much easier to check that the “Tested
via one or more NixOS test(s)” has been checked if the file modified
already includes the list of relevant tests.
Implementation
--------------
Currently, this commit only adds the metadata in the package. Each
element of the `meta.tests` attribute is a derivation that, when it
builds successfully, means the test has passed (ie. following the same
convention as NixOS tests).
Future Work
-----------
In the future, the tools could be made aware of this `meta.tests`
attribute, and for instance a `--with-tests` could be added to
`nix-build` so that it also builds all the tests. Or a `--without-tests`
to build without all the tests. @Profpatsch described in his NixCon talk
such systems.
Another thing that would help in the future would be the possibility to
reasonably easily have cross-derivation nix tests without the whole
NixOS VM stack. @7c6f434c already proposed such a system.
This RFC currently handles none of these concerns. Only the addition of
`meta.tests` as metadata to be used by maintainers to remember to run
relevant tests.
2018-08-04 05:18:28 +02:00
|
|
|
'';
|
|
|
|
|
|
|
|
meta.needsVMSupport = true;
|
2010-01-05 12:18:43 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
makeTest =
|
2015-05-22 07:14:00 +02:00
|
|
|
{ testScript
|
|
|
|
, makeCoverageReport ? false
|
|
|
|
, enableOCR ? false
|
|
|
|
, name ? "unnamed"
|
|
|
|
, ...
|
|
|
|
} @ t:
|
2010-02-17 10:37:22 +01:00
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
let
|
2018-02-20 12:55:58 +01:00
|
|
|
# A standard store path to the vm monitor is built like this:
|
|
|
|
# /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
|
|
|
|
# The max filename length of a unix domain socket is 108 bytes.
|
|
|
|
# This means $name can at most be 50 bytes long.
|
2018-02-19 12:17:13 +01:00
|
|
|
maxTestNameLen = 50;
|
|
|
|
testNameLen = builtins.stringLength name;
|
|
|
|
|
|
|
|
testDriverName = with builtins;
|
|
|
|
if testNameLen > maxTestNameLen then
|
|
|
|
abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
|
|
|
|
"it's currently ${toString testNameLen} characters long.")
|
|
|
|
else
|
|
|
|
"nixos-test-driver-${name}";
|
2014-03-03 13:39:30 +01:00
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
nodes = buildVirtualNetwork (
|
|
|
|
t.nodes or (if t ? machine then { machine = t.machine; } else { }));
|
2011-01-16 15:21:47 +01:00
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
testScript' =
|
|
|
|
# Call the test script with the computed nodes.
|
2018-01-31 20:02:19 +01:00
|
|
|
if lib.isFunction testScript
|
2014-04-14 14:23:38 +02:00
|
|
|
then testScript { inherit nodes; }
|
|
|
|
else testScript;
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
|
2011-01-16 15:21:47 +01:00
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2017-04-09 23:34:26 +02:00
|
|
|
ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };
|
2015-05-22 08:01:17 +02:00
|
|
|
|
2018-03-30 05:27:53 +02:00
|
|
|
imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
|
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
# Generate onvenience wrappers for running the test driver
|
|
|
|
# interactively with the specified network, and for starting the
|
|
|
|
# VMs from the command line.
|
2014-06-25 12:45:52 +02:00
|
|
|
driver = runCommand testDriverName
|
2014-04-14 14:23:38 +02:00
|
|
|
{ buildInputs = [ makeWrapper];
|
|
|
|
testScript = testScript';
|
|
|
|
preferLocalBuild = true;
|
2014-06-25 12:45:52 +02:00
|
|
|
testName = name;
|
2014-04-14 14:23:38 +02:00
|
|
|
}
|
|
|
|
''
|
|
|
|
mkdir -p $out/bin
|
|
|
|
echo "$testScript" > $out/test-script
|
|
|
|
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
|
2017-03-20 14:15:38 +01:00
|
|
|
vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
|
2014-04-14 14:23:38 +02:00
|
|
|
wrapProgram $out/bin/nixos-test-driver \
|
2017-03-20 14:15:38 +01:00
|
|
|
--add-flags "''${vms[*]}" \
|
2017-04-09 23:34:26 +02:00
|
|
|
${lib.optionalString enableOCR
|
2018-03-30 05:27:53 +02:00
|
|
|
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
|
2017-11-19 15:15:19 +01:00
|
|
|
--run "export testScript=\"\$(cat $out/test-script)\"" \
|
2016-06-19 13:38:46 +02:00
|
|
|
--set VLANS '${toString vlans}'
|
2014-04-14 14:23:38 +02:00
|
|
|
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
|
|
|
|
wrapProgram $out/bin/nixos-run-vms \
|
2017-03-20 14:15:38 +01:00
|
|
|
--add-flags "''${vms[*]}" \
|
2015-05-22 08:01:17 +02:00
|
|
|
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
|
2016-06-19 13:38:46 +02:00
|
|
|
--set tests 'startAll; joinAll;' \
|
|
|
|
--set VLANS '${toString vlans}' \
|
2014-04-14 14:23:38 +02:00
|
|
|
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
|
|
|
|
''; # "
|
|
|
|
|
2015-07-12 12:09:40 +02:00
|
|
|
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
|
|
|
|
meta = (drv.meta or {}) // t.meta;
|
|
|
|
};
|
2014-04-14 14:23:38 +02:00
|
|
|
|
2015-07-12 12:09:40 +02:00
|
|
|
test = passMeta (runTests driver);
|
|
|
|
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
|
2010-03-10 23:51:53 +01:00
|
|
|
|
2018-02-27 13:07:35 +01:00
|
|
|
in (if makeCoverageReport then report else test) // {
|
|
|
|
inherit nodes driver test;
|
2015-07-12 12:09:40 +02:00
|
|
|
};
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2010-05-21 16:31:05 +02:00
|
|
|
runInMachine =
|
|
|
|
{ drv
|
|
|
|
, machine
|
|
|
|
, preBuild ? ""
|
|
|
|
, postBuild ? ""
|
2011-01-13 11:54:07 +01:00
|
|
|
, ... # ???
|
2010-05-21 16:31:05 +02:00
|
|
|
}:
|
2010-03-11 14:11:06 +01:00
|
|
|
let
|
2011-01-13 11:54:07 +01:00
|
|
|
vm = buildVM { }
|
2011-01-13 12:39:03 +01:00
|
|
|
[ machine
|
2013-10-16 11:36:09 +02:00
|
|
|
{ key = "run-in-machine";
|
|
|
|
networking.hostName = "client";
|
|
|
|
nix.readOnlyStore = false;
|
2017-10-11 20:01:45 +02:00
|
|
|
virtualisation.writableStore = false;
|
2013-10-16 11:36:09 +02:00
|
|
|
}
|
2011-01-13 11:54:07 +01:00
|
|
|
];
|
2010-03-11 14:11:06 +01:00
|
|
|
|
|
|
|
buildrunner = writeText "vm-build" ''
|
|
|
|
source $1
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2010-03-11 14:11:06 +01:00
|
|
|
${coreutils}/bin/mkdir -p $TMPDIR
|
2010-07-23 15:59:50 +02:00
|
|
|
cd $TMPDIR
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2016-09-08 15:34:04 +02:00
|
|
|
exec $origBuilder $origArgs
|
2010-03-11 14:11:06 +01:00
|
|
|
'';
|
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
testScript = ''
|
2010-03-11 14:11:06 +01:00
|
|
|
startAll;
|
2013-10-16 11:36:09 +02:00
|
|
|
$client->waitForUnit("multi-user.target");
|
2010-03-11 14:11:06 +01:00
|
|
|
${preBuild}
|
2014-09-24 23:48:31 +02:00
|
|
|
$client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
|
2010-03-11 14:11:06 +01:00
|
|
|
${postBuild}
|
2013-10-16 11:36:09 +02:00
|
|
|
$client->succeed("sync"); # flush all data before pulling the plug
|
2010-03-11 14:11:06 +01:00
|
|
|
'';
|
|
|
|
|
|
|
|
vmRunCommand = writeText "vm-run" ''
|
2016-09-08 15:34:04 +02:00
|
|
|
xchg=vm-state-client/xchg
|
2011-08-09 16:07:44 +02:00
|
|
|
${coreutils}/bin/mkdir $out
|
2016-09-08 15:34:04 +02:00
|
|
|
${coreutils}/bin/mkdir -p $xchg
|
|
|
|
|
|
|
|
for i in $passAsFile; do
|
|
|
|
i2=''${i}Path
|
|
|
|
_basename=$(${coreutils}/bin/basename ''${!i2})
|
|
|
|
${coreutils}/bin/cp ''${!i2} $xchg/$_basename
|
|
|
|
eval $i2=/tmp/xchg/$_basename
|
|
|
|
${coreutils}/bin/ls -la $xchg
|
|
|
|
done
|
|
|
|
|
2016-09-11 17:27:07 +02:00
|
|
|
unset i i2 _basename
|
|
|
|
export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
|
|
|
|
unset xchg
|
|
|
|
|
2014-04-14 14:23:38 +02:00
|
|
|
export tests='${testScript}'
|
2011-01-13 11:54:07 +01:00
|
|
|
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
|
2010-08-30 01:24:54 +02:00
|
|
|
''; # */
|
2010-03-11 14:11:06 +01:00
|
|
|
|
|
|
|
in
|
|
|
|
lib.overrideDerivation drv (attrs: {
|
2010-08-30 01:24:54 +02:00
|
|
|
requiredSystemFeatures = [ "kvm" ];
|
2010-03-11 14:11:06 +01:00
|
|
|
builder = "${bash}/bin/sh";
|
|
|
|
args = ["-e" vmRunCommand];
|
|
|
|
origArgs = attrs.args;
|
2011-09-14 20:20:50 +02:00
|
|
|
origBuilder = attrs.builder;
|
2010-03-11 14:11:06 +01:00
|
|
|
});
|
2010-03-11 16:09:10 +01:00
|
|
|
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2011-01-13 11:54:07 +01:00
|
|
|
runInMachineWithX = { require ? [], ... } @ args:
|
2010-03-11 16:09:10 +01:00
|
|
|
let
|
|
|
|
client =
|
2018-07-20 22:56:59 +02:00
|
|
|
{ ... }:
|
2010-03-11 16:09:10 +01:00
|
|
|
{
|
2010-04-29 14:45:22 +02:00
|
|
|
inherit require;
|
2010-03-11 16:09:10 +01:00
|
|
|
virtualisation.memorySize = 1024;
|
|
|
|
services.xserver.enable = true;
|
|
|
|
services.xserver.displayManager.slim.enable = false;
|
|
|
|
services.xserver.displayManager.auto.enable = true;
|
|
|
|
services.xserver.windowManager.default = "icewm";
|
|
|
|
services.xserver.windowManager.icewm.enable = true;
|
|
|
|
services.xserver.desktopManager.default = "none";
|
|
|
|
};
|
|
|
|
in
|
|
|
|
runInMachine ({
|
2011-01-13 11:54:07 +01:00
|
|
|
machine = client;
|
|
|
|
preBuild =
|
|
|
|
''
|
|
|
|
$client->waitForX;
|
|
|
|
'';
|
|
|
|
} // args);
|
2010-03-11 16:09:10 +01:00
|
|
|
|
2011-09-14 20:20:50 +02:00
|
|
|
|
2014-04-24 15:46:10 +02:00
|
|
|
simpleTest = as: (makeTest as).test;
|
2010-03-10 23:51:53 +01:00
|
|
|
|
2010-01-05 12:18:43 +01:00
|
|
|
}
|