alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #79335 from flokli/deprecate-perl-vm-tests

Browse source 
nixos/testing: add deprecation notice for Perl VM tests
This commit is contained in:
worldofpeace 2020-02-09 21:08:11 -05:00 committed by GitHub
parent 55ace3be68 0945178b3c
commit aa4ba502d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/lib/testing.nix
View file

@ -19,7 +19,11 @@ in rec {
inherit pkgs;
testDriver = stdenv.mkDerivation {
testDriver = lib.warn ''
Perl VM tests are deprecated and will be removed for 20.09.
Please update your tests to use the python test driver.
See https://github.com/NixOS/nixpkgs/pull/71684 for details.
'' stdenv.mkDerivation {
name = "nixos-test-driver";
buildInputs = [ makeWrapper perl ];

2
pkgs/test/nixos-functions/default.nix
View file

@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
environment.systemPackages = [ pkgs.hello ];
};
testScript = ''
$machine->succeed("hello");
machine.succeed("hello")
'';
});

6
pkgs/top-level/all-packages.nix
View file

@ -25026,7 +25026,7 @@ in
/*
* Run a NixOS VM network test using this evaluation of Nixpkgs.
*
* It is mostly equivalent to `import ./make-test.nix` from the
* It is mostly equivalent to `import ./make-test-python.nix` from the
* NixOS manual[1], except that your `pkgs` will be used instead of
* letting NixOS invoke Nixpkgs again. If a test machine needs to
* set NixOS options under `nixpkgs`, it must set only the
@ -25052,11 +25052,11 @@ in
*/
nixosTest =
let
/* The nixos/lib/testing.nix module, preapplied with arguments that
/* The nixos/lib/testing-python.nix module, preapplied with arguments that
* make sense for this evaluation of Nixpkgs.
*/
nixosTesting =
(import ../../nixos/lib/testing.nix {
(import ../../nixos/lib/testing-python.nix {
inherit (pkgs.stdenv.hostPlatform) system;
inherit pkgs;
extraConfigurations = [(