Make unittests a check

This commit is contained in:
Las Safin 2021-09-05 14:03:28 +00:00
parent 7a3f337935
commit b1570850bd
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
3 changed files with 15 additions and 11 deletions

View File

@ -46,7 +46,6 @@
# Nixpkgs instantiated for supported system types.
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; overlays = [ pythonOverlay self.overlay ]; });
override = drv:
drv.overrideAttrs (o: {
preConfigure = ''
@ -67,8 +66,7 @@
"lefdef" "bootstrap" "coloquinte"
"equinox" "knik" "ispd" "karakaze" "nimbus"
"metis" "mauka" "solstice" "stratus1"
"documentation" "unittests" "combined"
"libresoc-experiments9"
"documentation" "combined" "libresoc-experiments9"
];
commonArgs = { inherit version meta generic inputs; };
@ -94,9 +92,11 @@
checks = forAllSystems (system: {
alliance-check-toolkit = nixpkgsFor.${system}.callPackage (
import ./nix/alliance-check-toolkit.nix {
alliance-src = alliance-check-toolkit;
}
import ./nix/alliance-check-toolkit.nix { inherit alliance-check-toolkit; }
) {};
unittests = nixpkgsFor.${system}.callPackage (
import ./nix/unittests.nix { inherit version meta; }
) {};
});
@ -115,6 +115,8 @@
}
);
#hydraJobs.coriolis = self.defaultPackage;
hydraJobs.combined = forAllSystems (system: self.packages.${system}.combined);
hydraJobs.alliance-check-toolkit = forAllSystems (system: self.checks.${system}.alliance-check-toolkit);
hydraJobs.unittests = forAllSystems (system: self.checks.${system}.unittests);
};
}

View File

@ -1,12 +1,12 @@
{ alliance-src }:
{ alliance-check-toolkit }:
{ stdenv, coriolis-combined, coriolis-unicorn, coriolis-cumulus
, python2Packages, alliance, yosys }:
stdenv.mkDerivation {
pname = "alliance-check-toolkit";
version = builtins.substring 0 8 alliance-src.lastModifiedDate;
src = alliance-src;
version = builtins.substring 0 8 alliance-check-toolkit.lastModifiedDate;
src = alliance-check-toolkit;
nativeBuildInputs = [ alliance coriolis-unicorn coriolis-cumulus yosys ];

View File

@ -28,5 +28,7 @@ stdenv.mkDerivation {
runHook postInstallCheck
'';
inherit version meta;
inherit version;
meta = meta // { license = lib.licenses.gpl2Plus; };
}