virtualbox: Change the virtualbox tests to not build the unfree tests by default. (#45415)
This commit is contained in:
parent
bc09c14519
commit
7d23ffb736
|
@ -1,4 +1,4 @@
|
||||||
{ system ? builtins.currentSystem, debug ? false }:
|
{ system ? builtins.currentSystem, debug ? false, enableUnfree ? false }:
|
||||||
|
|
||||||
with import ../lib/testing.nix { inherit system; };
|
with import ../lib/testing.nix { inherit system; };
|
||||||
with pkgs.lib;
|
with pkgs.lib;
|
||||||
|
@ -378,6 +378,26 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) {
|
||||||
|
enable-extension-pack = ''
|
||||||
|
createVM_testExtensionPack;
|
||||||
|
vbm("startvm testExtensionPack");
|
||||||
|
waitForStartup_testExtensionPack;
|
||||||
|
$machine->screenshot("cli_started");
|
||||||
|
waitForVMBoot_testExtensionPack;
|
||||||
|
$machine->screenshot("cli_booted");
|
||||||
|
|
||||||
|
$machine->nest("Checking for privilege escalation", sub {
|
||||||
|
$machine->fail("test -e '/root/VirtualBox VMs'");
|
||||||
|
$machine->fail("test -e '/root/.config/VirtualBox'");
|
||||||
|
$machine->succeed("test -e '/home/alice/VirtualBox VMs'");
|
||||||
|
});
|
||||||
|
|
||||||
|
shutdownVM_testExtensionPack;
|
||||||
|
destroyVM_testExtensionPack;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
in mapAttrs (mkVBoxTest false vboxVMs) {
|
in mapAttrs (mkVBoxTest false vboxVMs) {
|
||||||
simple-gui = ''
|
simple-gui = ''
|
||||||
createVM_simple;
|
createVM_simple;
|
||||||
|
@ -484,22 +504,4 @@ in mapAttrs (mkVBoxTest false vboxVMs) {
|
||||||
destroyVM_test1;
|
destroyVM_test1;
|
||||||
destroyVM_test2;
|
destroyVM_test2;
|
||||||
'';
|
'';
|
||||||
} // mapAttrs (mkVBoxTest true vboxVMsWithExtpack) {
|
} // (if enableUnfree then unfreeTests else {})
|
||||||
enable-extension-pack = ''
|
|
||||||
createVM_testExtensionPack;
|
|
||||||
vbm("startvm testExtensionPack");
|
|
||||||
waitForStartup_testExtensionPack;
|
|
||||||
$machine->screenshot("cli_started");
|
|
||||||
waitForVMBoot_testExtensionPack;
|
|
||||||
$machine->screenshot("cli_booted");
|
|
||||||
|
|
||||||
$machine->nest("Checking for privilege escalation", sub {
|
|
||||||
$machine->fail("test -e '/root/VirtualBox VMs'");
|
|
||||||
$machine->fail("test -e '/root/.config/VirtualBox'");
|
|
||||||
$machine->succeed("test -e '/home/alice/VirtualBox VMs'");
|
|
||||||
});
|
|
||||||
|
|
||||||
shutdownVM_testExtensionPack;
|
|
||||||
destroyVM_testExtensionPack;
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue