nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 22:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92915 from Patagonicus/issue-91706

Browse Source 
Revert "bashCompletion: speed-up test execution by using xdist"
This commit is contained in:
Florian Klink 2020-07-11 13:32:29 +02:00 committed by GitHub
commit 98b2a62eda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/bash/bash-completion/default.nix
View File

@ -30,10 +30,6 @@ stdenv.mkDerivation rec {
python3Packages.pexpect python3Packages.pexpect
python3Packages.pytest python3Packages.pytest
bashInteractive bashInteractive
# use xdist to speed up the test run, just like upstream:
# https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4
python3Packages.pytest_xdist
]; ];
# - ignore test_gcc on ARM because it assumes -march=native # - ignore test_gcc on ARM because it assumes -march=native
@ -44,7 +40,7 @@ stdenv.mkDerivation rec {
# - ignore test_ls because impure logic # - ignore test_ls because impure logic
# - ignore test_screen because it assumes vt terminals exist # - ignore test_screen because it assumes vt terminals exist
checkPhase = '' checkPhase = ''
pytest -n $NIX_BUILD_CORES . \ pytest . \
${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \
--ignore=test/t/test_chsh.py \ --ignore=test/t/test_chsh.py \
--ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ether_wake.py \