diff --git a/tests/rt.sh b/tests/rt.sh index b8a4013734..28037bca99 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -9,7 +9,7 @@ die() { echo "$@" >&2; exit 1; } usage() { set +x echo - echo "Usage: $0 -c | -e | -h | -k | -l | -m | -n | -r " + echo "Usage: $0 -c | -e | -h | -k | -w | -l | -m | -n | -r " echo echo " -c create new baseline results" echo " -e use ecFlow workflow manager" @@ -19,6 +19,7 @@ usage() { echo " -m compare against new baseline results" echo " -n run single test " echo " -r use Rocoto workflow manager" + echo " -w for weekly_test, skip comparing baseline results" echo set -x exit 1 @@ -407,10 +408,11 @@ ECFLOW=false KEEP_RUNDIR=false SINGLE_NAME='' TEST_35D=false +export skip_check_results=false TESTS_FILE='rt.conf' -while getopts ":cl:mn:kreh" opt; do +while getopts ":cl:mn:wkreh" opt; do case $opt in c) CREATE_BASELINE=true @@ -427,6 +429,9 @@ while getopts ":cl:mn:kreh" opt; do TESTS_FILE='rt.conf.single' rm -f $TESTS_FILE ;; + w) + export skip_check_results=true + ;; k) KEEP_RUNDIR=true ;; @@ -482,7 +487,11 @@ if [[ $CREATE_BASELINE == true ]]; then mkdir -p "${NEW_BASELINE}" fi -REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_$MACHINE_ID.log +if [[ $skip_check_results == true ]]; then + REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_weekly_$MACHINE_ID.log +else + REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_$MACHINE_ID.log +fi date > ${REGRESSIONTEST_LOG} echo "Start Regression test" >> ${REGRESSIONTEST_LOG} diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh index 937b8e2bc3..d1c39b09b3 100755 --- a/tests/rt_utils.sh +++ b/tests/rt_utils.sh @@ -202,7 +202,7 @@ submit_and_wait() { if [[ $test_status = 'FAIL' ]]; then if [[ ${OPNREQ_TEST} == false ]]; then - echo "${TEST_NAME} ${TEST_NR} failed" >> $PATHRT/fail_test_${TEST_NR} + echo "${TEST_NAME} ${TEST_NR}" >> $PATHRT/fail_test_${TEST_NR} echo "Test ${TEST_NR} ${TEST_NAME} FAIL" >> ${REGRESSIONTEST_LOG} echo;echo;echo >> ${REGRESSIONTEST_LOG} echo "Test ${TEST_NR} ${TEST_NAME} FAIL" @@ -215,6 +215,12 @@ submit_and_wait() { fi fi + if [[ $test_status = 'PASS' || $test_status = 'DONE' ]]; then + echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" >> ${REGRESSIONTEST_LOG} + echo;echo;echo >> ${REGRESSIONTEST_LOG} + echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" + fi + eval "$set_x" } diff --git a/tests/run_test.sh b/tests/run_test.sh index 1bc3c9599d..05c259f5ff 100755 --- a/tests/run_test.sh +++ b/tests/run_test.sh @@ -237,7 +237,9 @@ else fi -check_results +if [[ $skip_check_results = false ]]; then + check_results +fi if [[ $SCHEDULER != 'none' ]]; then cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt