X-Git-Url: http://git.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=tests%2Fshunit2%2Ftests.sh;h=00f56c5e319594d9e90871fe7ae9686593b48580;hp=a7c6d900498723046794fee60312fa61f287260b;hb=1637d29186923bf75c015a9c27e3bbfc951a488c;hpb=17d6144a49c6289e43779c57b824d26c8200f512 diff --git a/tests/shunit2/tests.sh b/tests/shunit2/tests.sh index a7c6d90..00f56c5 100755 --- a/tests/shunit2/tests.sh +++ b/tests/shunit2/tests.sh @@ -7,10 +7,12 @@ TMP_DIR=${TESTS_DIR}"/tmp" FULL_SUITE=${TESTS_DIR}"/full_suite.sh" UCI_BIN=${UCI_BIN:-"../uci"} -[ -x $UCI_BIN ] || { +[ -x "$UCI_BIN" ] || { echo "uci is not present." >&2 return 1 } +VALGRIND="valgrind --quiet --show-leak-kinds=all --leak-check=full --track-origins=yes" +UCI_BIN="${VALGRIND} ${UCI_BIN}" UCI="${UCI_BIN} -c ${CONFIG_DIR} -p ${CHANGES_DIR}" UCI_Q="${UCI_BIN} -c ${CONFIG_DIR} -p ${CHANGES_DIR} -q" @@ -60,9 +62,9 @@ assertFailWithNoReturn() { } EOF -for suite in $(ls ${SCRIPTS_DIR}/*) +for suite in "${SCRIPTS_DIR}"/* do - cat ${suite} >> ${FULL_SUITE} + cat "${suite}" >> ${FULL_SUITE} done echo ". ${DO_TEST}" >> ${FULL_SUITE}