Skip to content

[backport 2.3] Parallelize test suite#5649

Merged
edolstra merged 5 commits intoNixOS:2.3-maintenancefrom
obsidiansystems:2.3-modernize-test-suite
Dec 9, 2021
Merged

[backport 2.3] Parallelize test suite#5649
edolstra merged 5 commits intoNixOS:2.3-maintenancefrom
obsidiansystems:2.3-modernize-test-suite

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Nov 24, 2021

This is the first step to backporting the nix-2.4 test suite feature. The goal is to be able to make sure Nix 2.3 works with the Nix 2.4 daemon.

Unfortunately there is a weird error in the nix-shell test. It seems merely changing the location of the shell.shebang.sh file messed up the -I nixpkgs=shell.nix. I have no idea what this is about, except that it doesn't occur in Nix 2.4. The error message in https://discourse.nixos.org/t/weird-inconsistency-for-nix-shell-run/11730/5 seem possibly related. The last cherry-picked fixes it.

depends on #5688

@Ericson2314 Ericson2314 changed the title [backport 2.3] Parallel test suite [backport 2.3] Parallelize test suite Nov 24, 2021
@Ericson2314 Ericson2314 marked this pull request as ready for review November 25, 2021 00:05
thufschmitt and others added 5 commits November 30, 2021 05:33
Cause the time needed to run the testsuite to drop from ~4mins to ~40s

(cherry picked from commit 1b5aa60)
Reuse the pre-existing list rather than the one written as part of NixOS#3777

(cherry picked from commit 5101ed1)
Fix a socket length failure on the OSX builders

(cherry picked from commit 223fbe6)
For some reason, the bash shell started by 'nix develop' sometimes
reads from stdin, which can hang.

(cherry picked from commit 50a8710)
Without this, moving the nix-shell tests into a `nix-shell` dir breaks
them.

(cherry picked from commit a70706b)
@Ericson2314 Ericson2314 force-pushed the 2.3-modernize-test-suite branch from 2e398e8 to 75bd197 Compare November 30, 2021 05:33
@dpulls
Copy link

dpulls bot commented Nov 30, 2021

🎉 All dependencies have been resolved !

@Ericson2314 Ericson2314 changed the base branch from 2.3-maintenance to master November 30, 2021 17:27
@Ericson2314 Ericson2314 changed the base branch from master to 2.3-maintenance November 30, 2021 17:27
@edolstra edolstra merged commit 6507aef into NixOS:2.3-maintenance Dec 9, 2021
@Ericson2314 Ericson2314 deleted the 2.3-modernize-test-suite branch December 9, 2021 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants