github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76253 from YoubingLi/bugfix

Browse Source 
Fixes # 76094 - Check the content of WHAT for Makefile's verify target
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 18:05:05 -07:00 committed by GitHub
commit 92562d5bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hack/make-rules/verify.sh
View File

@ -82,6 +82,8 @@ QUICK_PATTERNS+=(
EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true) EXCLUDED_CHECKS=$(ls ${EXCLUDED_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true)
QUICK_CHECKS=$(ls ${QUICK_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true) QUICK_CHECKS=$(ls ${QUICK_PATTERNS[@]/#/${KUBE_ROOT}\/hack\/} 2>/dev/null || true)
TARGET_LIST=()
IFS=" " read -r -a TARGET_LIST <<< "${WHAT:-}"
function is-excluded { function is-excluded {
for e in ${EXCLUDED_CHECKS[@]}; do for e in ${EXCLUDED_CHECKS[@]}; do
@ -104,10 +106,13 @@ function is-quick {
function is-explicitly-chosen { function is-explicitly-chosen {
local name="${1#verify-}" local name="${1#verify-}"
name="${name%.*}" name="${name%.*}"
for e in ${WHAT}; do index=0
for e in "${TARGET_LIST[@]}"; do
if [[ "${e}" == "${name}" ]]; then if [[ "${e}" == "${name}" ]]; then
TARGET_LIST[${index}]=""
return return
fi fi
index=$((index + 1))
done done
return 1 return 1
} }
@ -176,6 +181,20 @@ function run-checks {
done done
} }
# Check invalid targets specified in "WHAT" and mark them as failure cases
function missing-target-checks {
# In case WHAT is not specified
[[ ${#TARGET_LIST[@]} -eq 0 ]] && return
for v in "${TARGET_LIST[@]}"
do
[[ -z "${v}" ]] && continue
FAILED_TESTS+=(${v})
ret=1
done
}
SILENT=${SILENT:-false} SILENT=${SILENT:-false}
QUICK=${QUICK:-false} QUICK=${QUICK:-false}
@ -190,6 +209,7 @@ fi
ret=0 ret=0
run-checks "${KUBE_ROOT}/hack/verify-*.sh" bash run-checks "${KUBE_ROOT}/hack/verify-*.sh" bash
run-checks "${KUBE_ROOT}/hack/verify-*.py" python run-checks "${KUBE_ROOT}/hack/verify-*.py" python
missing-target-checks
if [[ ${ret} -eq 1 ]]; then if [[ ${ret} -eq 1 ]]; then
print-failed-tests print-failed-tests