unittestCheckHook: handle unittestFlagsArray __structuredAttrs-agnostically

Take unittestFlags as the new and conforming interface.

Keep unittestFlagsArray as is.
This commit is contained in:
Yueh-Shun Li
2024-10-07 08:37:10 +08:00
parent 76f6a3b292
commit 1e8f39148a
3 changed files with 13 additions and 2 deletions

View File

@@ -1433,7 +1433,7 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or
unittestCheckHook
];
unittestFlagsArray = [
unittestFlags = [
"-s" "tests" "-v"
];
}

View File

@@ -5,7 +5,14 @@ unittestCheckPhase() {
echo "Executing unittestCheckPhase"
runHook preCheck
eval "@pythonCheckInterpreter@ -m unittest discover $unittestFlagsArray"
local -a flagsArray=()
# Compatibility layer to the obsolete unittestFlagsArray
eval "flagsArray+=(${unittestFlagsArray[*]-})"
concatTo flagsArray unittestFlags
echoCmd 'unittest flags' "${flagsArray[@]}"
@pythonCheckInterpreter@ -m unittest discover "${flagsArray[@]}"
runHook postCheck
echo "Finished executing unittestCheckPhase"

View File

@@ -108,6 +108,7 @@ let
"disabledTests"
"pytestFlags"
"pytestFlagsArray"
"unittestFlags"
"unittestFlagsArray"
"outputs"
"stdenv"
@@ -446,6 +447,9 @@ let
// optionalAttrs (attrs ? pytestFlagsArray) {
pytestFlagsArray = attrs.pytestFlagsArray;
}
// optionalAttrs (attrs ? unittestFlags) {
unittestFlags = attrs.unittestFlags;
}
// optionalAttrs (attrs ? unittestFlagsArray) {
unittestFlagsArray = attrs.unittestFlagsArray;
}