diff options
author | Robert T. McGibbon <rmcgibbo@gmail.com> | 2021-02-19 09:58:39 -0500 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-14 21:59:55 -0700 |
commit | 2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d (patch) | |
tree | 78169aacd35515b89fc5542ad4a024ae5e39da9d /pkgs/development | |
parent | 7dd53fe56e52c6b0193575aca4fd5c3732a01e83 (diff) | |
download | nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar.gz nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar.bz2 nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar.lz nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar.xz nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.tar.zst nixpkgs-2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d.zip |
pytestCheckHook: improve disabledTestPaths whitespace handling
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/python/hooks/pytest-check-hook.sh | 7 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index eb45205ff73..0f708f88829 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing pytest-check-hook" declare -ar disabledTests -declare -ar disabledTestPaths +declare -a disabledTestPaths function _concatSep { local result @@ -37,6 +37,11 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi + + if [ -n "${disabledTestPaths-}" ]; then + eval "disabledTestPaths=($disabledTestPaths)" + fi + for path in ${disabledTestPaths[@]}; do if [ ! -e "$path" ]; then echo "Disabled tests path \"$path\" does not exist. Aborting" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index e9c769821d6..4917b167046 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -93,6 +93,8 @@ , doCheck ? config.doCheckByDefault or false +, disabledTestPaths ? [] + , ... } @ attrs: @@ -108,6 +110,7 @@ let self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabledTestPaths" ]) // { name = namePrefix + name_; @@ -178,6 +181,8 @@ let # If given use the specified checkPhase, otherwise use the setup hook. # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. installCheckPhase = attrs.checkPhase; + } // lib.optionalAttrs (disabledTestPaths != []) { + disabledTestPaths = lib.escapeShellArgs disabledTestPaths; })); passthru.updateScript = let |