bin/check.sh: do not force skip test on skip parse

vseva/base_dirs
Victor Seva 13 years ago
parent e091e7d0b7
commit 300bb0f286

@ -292,7 +292,7 @@ function usage
echo -e "\t-R: skip run sipp" echo -e "\t-R: skip run sipp"
echo -e "\t-D: skip deletion of domain and subscribers as final step" echo -e "\t-D: skip deletion of domain and subscribers as final step"
echo -e "\t-T: skip checks" echo -e "\t-T: skip checks"
echo -e "\t-P: skip parse. -T is froced" echo -e "\t-P: skip parse"
echo -e "\t-G: creation of graphviz image" echo -e "\t-G: creation of graphviz image"
echo -e "\t-d: DOMAIN" echo -e "\t-d: DOMAIN"
echo -e "\t-p CE|PRO default is CE" echo -e "\t-p CE|PRO default is CE"
@ -309,7 +309,7 @@ while getopts 'hCd:p:RDTPG' opt; do
R) SKIP_RUNSIPP=1;; R) SKIP_RUNSIPP=1;;
D) SKIP_DELDOMAIN=1;; D) SKIP_DELDOMAIN=1;;
T) SKIP_TESTS=1;; T) SKIP_TESTS=1;;
P) SKIP_PARSE=1; SKIP_TESTS=1;; P) SKIP_PARSE=1;;
G) GRAPH=1;; G) GRAPH=1;;
esac esac
done done

@ -58,7 +58,7 @@ rm -rf ${LOG_DIR}
for t in $(find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d | grep -v templates | sort); do for t in $(find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d | grep -v templates | sort); do
echo "$(date) - Run[${PROFILE}]: $(basename $t) =================================================" echo "$(date) - Run[${PROFILE}]: $(basename $t) ================================================="
${BIN_DIR}/check.sh -P -d ${DOMAIN} -p ${PROFILE} $(basename $t) ${BIN_DIR}/check.sh -P -T -d ${DOMAIN} -p ${PROFILE} $(basename $t)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
error_flag=1 error_flag=1
fi fi

Loading…
Cancel
Save