pytestCheckHook: improve disabledTestPaths whitespace handling
This commit is contained in:
committed by
Jonathan Ringer
parent
7dd53fe56e
commit
2e55b7301b
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user