From e091e7d0b790bc045f6101964a2f1eb955152bce Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 23 Sep 2013 12:48:51 +0200 Subject: [PATCH] bin/check.sh: fix skip creation option --- bin/check.sh | 34 +++++++++++++++++----------------- get_results.sh | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/check.sh b/bin/check.sh index 6b16364a..2daa0405 100755 --- a/bin/check.sh +++ b/bin/check.sh @@ -358,26 +358,26 @@ if [ -z $SKIP ]; then create_voip ${DOMAIN} echo "$(date) - Adding prefs" create_voip_prefs +fi - if [ -z $SKIP_RUNSIPP ]; then - echo "$(date) - Cleaning csv/reg.xml files" - find ${SCEN_CHECK_DIR} -name 'sipp_scenario_responder*_reg.xml' -exec rm {} \; - find ${SCEN_CHECK_DIR} -name '*.csv' -exec rm {} \; - echo "$(date) - Generating csv/reg.xml files" - ${BIN_DIR}/scenario.pl ${SCEN_CHECK_DIR}/scenario.yml - if [[ $? -ne 0 ]]; then - error_helper "Error creating csv files" 4 - fi - echo "$(date) - Running sipp scenarios" - run_sipp - echo "$(date) - Done sipp" +if [ -z $SKIP_RUNSIPP ]; then + echo "$(date) - Cleaning csv/reg.xml files" + find ${SCEN_CHECK_DIR} -name 'sipp_scenario_responder*_reg.xml' -exec rm {} \; + find ${SCEN_CHECK_DIR} -name '*.csv' -exec rm {} \; + echo "$(date) - Generating csv/reg.xml files" + ${BIN_DIR}/scenario.pl ${SCEN_CHECK_DIR}/scenario.yml + if [[ $? -ne 0 ]]; then + error_helper "Error creating csv files" 4 fi + echo "$(date) - Running sipp scenarios" + run_sipp + echo "$(date) - Done sipp" +fi - if [ -z ${SKIP_DELDOMAIN} ]; then - echo "$(date) - Deleting domain:${DOMAIN}" - delete_voip ${DOMAIN} - echo "$(date) - Done" - fi +if [ -z ${SKIP_DELDOMAIN} ]; then + echo "$(date) - Deleting domain:${DOMAIN}" + delete_voip ${DOMAIN} + echo "$(date) - Done" fi if [ -z ${SKIP_PARSE} ]; then diff --git a/get_results.sh b/get_results.sh index 1b60f61a..c0f393b5 100755 --- a/get_results.sh +++ b/get_results.sh @@ -42,7 +42,7 @@ echo "$(date) - Clean result dir" rm -rf ${RESULT_DIR} find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | grep -v templates| sort \ - | parallel "${BIN_DIR}/check.sh ${GRAPH} -C -d ${DOMAIN} -p ${PROFILE}" + | parallel "${BIN_DIR}/check.sh ${GRAPH} -C -R -d ${DOMAIN} -p ${PROFILE}" status=$? echo "$(date) - All done[$status]" exit $status