From a93b67fe9795e88f21b6576bdcfcccbb8fccfa08 Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Tue, 15 Mar 2016 15:41:01 -0700 Subject: [PATCH] Add and to the bad symbols check --- hack/after-build/verify-symbols.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hack/after-build/verify-symbols.sh b/hack/after-build/verify-symbols.sh index 7fad4131a5a..61f535cca12 100755 --- a/hack/after-build/verify-symbols.sh +++ b/hack/after-build/verify-symbols.sh @@ -24,11 +24,17 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env # add other BADSYMBOLS here. -BADSYMBOLS="testing[.]" +BADSYMBOLS=( + "httptest" + "testify" + "testing[.]" +) +# Join symbols with OR '\|' pattern +PATTERN="$(printf '\|%s' "${BADSYMBOLS[@]}" | tail -c +3)" # b/c hyperkube binds everything simply check that for bad symbols -if [[ $(nm ${KUBE_OUTPUT_HOSTBIN}/hyperkube | grep "${BADSYMBOLS}") ]]; then - echo "output binaries contain bad symbols \"${BADSYMBOLS}\"" +if nm ${KUBE_OUTPUT_HOSTBIN}/hyperkube | grep "${PATTERN}"; then + echo "output binaries contain bad symbols" exit 1 fi