public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildRustCrateTests: use releaseTools.aggregate

Browse Source 
Previously I did use `runCommand` to do the same. Using
releaseTools.aggregate seems a lot saner and we might get nicer hydra
output of the tests that are failing.
This commit is contained in:
Andreas Rammhold 2020-01-16 13:19:50 +01:00
parent 29a8575e3d
commit 69c96adc53
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/build-support/rust/build-rust-crate/test/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }: { lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }:
let let
mkCrate = args: let mkCrate = args: let
p = { p = {
@ -211,9 +211,12 @@ let
test -e ${pkg}/bin/brotli-decompressor && touch $out test -e ${pkg}/bin/brotli-decompressor && touch $out
''; '';
}; };
test = runCommand "run-buildRustCrate-tests" { test = releaseTools.aggregate {
nativeBuildInputs = builtins.attrValues tests; name = "buildRustCrate-tests";
} " meta = {
touch $out description = "Test cases for buildRustCrate";
"; maintainers = [ lib.maintainers.andir ];
};
constituents = builtins.attrValues tests;
};
} }

2
pkgs/top-level/all-packages.nix
View File

@ -8714,7 +8714,7 @@ in
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cratesIO = callPackage ../build-support/rust/crates-io.nix { };
cargo-web = callPackage ../development/tools/cargo-web { cargo-web = callPackage ../development/tools/cargo-web {