From 1fe58cb05088030f4350662f5f04fe4bf3940656 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 23 Sep 2023 00:09:26 +0200 Subject: [PATCH] tests.nixpkgs-check-by-name: Fix non-reproducible test failures This was an oversight in https://github.com/NixOS/nixpkgs/pull/254435 --- pkgs/test/nixpkgs-check-by-name/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/default.nix index cb8a672bc990cc..f69a134f568f4b 100644 --- a/pkgs/test/nixpkgs-check-by-name/default.nix +++ b/pkgs/test/nixpkgs-check-by-name/default.nix @@ -26,10 +26,13 @@ let export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STORE_DIR=$TEST_ROOT/store - # cargo tests run in parallel by default, which would then run into - # https://github.com/NixOS/nix/issues/2706 unless the store is initialised first + # Ensure that even if tests run in parallel, we don't get an error + # We'd run into https://github.com/NixOS/nix/issues/2706 unless the store is initialised first nix-store --init ''; + # The tests use the shared environment variables, + # so we cannot run them in parallel + dontUseCargoParallelTests = true; postCheck = '' cargo fmt --check cargo clippy -- -D warnings