Skip to content

Commit

Permalink
rustPlatform.buildRustPackage: Add support for setting test flags
Browse files Browse the repository at this point in the history
  • Loading branch information
bkchr committed Dec 20, 2019
1 parent 784914c commit 7a90dd8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkgs/build-support/rust/default.nix
Expand Up @@ -16,6 +16,7 @@
, # Set to true to verify if the cargo dependencies are up to date.
# This will change the value of cargoSha256.
verifyCargoDeps ? false
, cargoTestFlags ? []
, buildType ? "release"
, meta ? {}
, target ? null
Expand Down Expand Up @@ -48,6 +49,8 @@ let

rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target;

testFlags = stdenv.lib.concatStringsSep " " cargoTestFlags;

ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
Expand Down Expand Up @@ -146,8 +149,8 @@ stdenv.mkDerivation (args // {

checkPhase = args.checkPhase or ''
runHook preCheck
echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
echo "Running cargo cargo test ${testFlags} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test ${testFlags} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck
'';

Expand Down

0 comments on commit 7a90dd8

Please sign in to comment.