Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rust introduce checkFlags to parametrize test execution #70259

Merged
merged 3 commits into from
Oct 21, 2019
Merged

rust introduce checkFlags to parametrize test execution #70259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d130224
buildRustPackage: support checkFlags and checkFlagsArray
andir Jul 25, 2019
06744bb
rust-cbindgen: skip expand tests
andir Jul 25, 2019
e07c297
rust-cbdindgen: 0.9.0 -> 0.9.1
andir Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/build-support/rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ stdenv.mkDerivation (args // {

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

Expand Down
12 changes: 7 additions & 5 deletions pkgs/development/tools/rust/cbindgen/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@

rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
version = "0.9.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
sha256 = "1sh9kll3ky0d6chp7l7z8j91ckibxkfhi0v7imz2fgzzy2lbqy88";
sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19";
};

cargoSha256 = "1cn84xai1n0f8xwwwwig93dawk73g1w6n6zm4axg5zl4vrmq4j6w";
cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

# https://github.com/eqrion/cbindgen/issues/338
RUSTC_BOOTSTRAP = 1;
checkFlags = [
# https://github.com/eqrion/cbindgen/issues/338
"--skip test_expand"
];

meta = with stdenv.lib; {
description = "A project for generating C bindings from Rust code";
Expand Down