mirror of https://github.com/ceph/go-ceph
entrypoint: treat pkgs as a bash array
Because the package name should be a proper "list" and is used in multiple places, take shellcheck's warning to heart and replace it with a proper bash array. Use a common function for generating said array. Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
parent
f2f2c5447b
commit
8e8e24a81d
|
@ -263,14 +263,25 @@ pre_all_tests() {
|
||||||
echo "mode: count" > "cover.out"
|
echo "mode: count" > "cover.out"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
find_pkgs() {
|
||||||
|
if [[ $1 = "--public" ]] ; then
|
||||||
|
skip='^(contrib|internal)'
|
||||||
|
else
|
||||||
|
skip='^contrib'
|
||||||
|
fi
|
||||||
|
# saves results in array named `pkgs`
|
||||||
|
readarray -t pkgs < <(go list ${BUILD_TAGS} ./... | \
|
||||||
|
sed -e "s,^${PKG_PREFIX}/\?,," | \
|
||||||
|
grep -vE "${skip}" | grep '.' )
|
||||||
|
}
|
||||||
|
|
||||||
implements_tool() {
|
implements_tool() {
|
||||||
mkdir -p "${RESULTS_DIR}"
|
mkdir -p "${RESULTS_DIR}"
|
||||||
pkgs=$(go list ${BUILD_TAGS} ./... | sed -e "s,^${PKG_PREFIX}/\?,," | \
|
find_pkgs --public
|
||||||
grep -v ^contrib | grep -v ^internal)
|
|
||||||
show ./implements --list \
|
show ./implements --list \
|
||||||
--report-json "${RESULTS_DIR}/implements.json" \
|
--report-json "${RESULTS_DIR}/implements.json" \
|
||||||
--report-text "${RESULTS_DIR}/implements.txt" \
|
--report-text "${RESULTS_DIR}/implements.txt" \
|
||||||
${pkgs}
|
"${pkgs[@]}"
|
||||||
# output the brief summary info onto stdout
|
# output the brief summary info onto stdout
|
||||||
grep '^[A-Z]' "${RESULTS_DIR}/implements.txt"
|
grep '^[A-Z]' "${RESULTS_DIR}/implements.txt"
|
||||||
}
|
}
|
||||||
|
@ -303,7 +314,7 @@ test_go_ceph() {
|
||||||
return $?
|
return $?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkgs=$(go list ${BUILD_TAGS} ./... | sed -e "s,^${PKG_PREFIX}/\?,," | grep -v ^contrib)
|
find_pkgs
|
||||||
pre_all_tests
|
pre_all_tests
|
||||||
if [[ ${WAIT_FILES} ]]; then
|
if [[ ${WAIT_FILES} ]]; then
|
||||||
# this is less gross looking than any other bash-native split-to-array code
|
# this is less gross looking than any other bash-native split-to-array code
|
||||||
|
@ -314,7 +325,7 @@ test_go_ceph() {
|
||||||
setup_mirroring
|
setup_mirroring
|
||||||
export MIRROR_CONF
|
export MIRROR_CONF
|
||||||
fi
|
fi
|
||||||
for pkg in ${pkgs}; do
|
for pkg in "${pkgs[@]}"; do
|
||||||
test_pkg "${pkg}" || test_failed "${pkg}"
|
test_pkg "${pkg}" || test_failed "${pkg}"
|
||||||
done
|
done
|
||||||
post_all_tests
|
post_all_tests
|
||||||
|
|
Loading…
Reference in New Issue