diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-09-25 06:19:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-25 06:19:23 +0200 |
commit | a2960ac430c919c5f08d7ddc5c8e65e398ca1656 (patch) | |
tree | e485e46ee7ab559fbc84e506b8f9349ac5da7e0c /pkgs | |
parent | 45402e454f79933b2c94a00af2f2a10b9f17ea26 (diff) | |
parent | a6c17c9cdd23af192a811e6c7b3cfb37fcd986fb (diff) |
Merge pull request #97603 from zowoq/rust-test-threads
Diffstat (limited to 'pkgs')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index dd8ddd2dccb85..c9ad213cf1d15 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -39,8 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - #checkFlags = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; @@ -49,4 +48,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index e6185ec8ab9db..b656deaa71684 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - #checkFlagsArray = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 0103e064828b8..f6177ce198da8 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -30,6 +30,8 @@ , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} +, cargoParallelTestThreads ? true + # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -204,11 +206,12 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=$NIX_BUILD_CORES ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index dce18580577c9..6042f5f891a6a 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; - #checkFlags = "--test-threads=1"; - doCheck = false; + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + cargoParallelTestThreads = false; postInstall = '' $out/bin/the-way config default tmp.toml |