diff --git a/tests/test-all.sh b/tests/test-all.sh index 78fcfc681b1c7477301ecf182836eb3a05a3ce92..3c6bb67f26f8dd9fd21ba7fbf314e9fc27745ac9 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -139,17 +139,17 @@ function runPyCaseOneByOne { case=`echo $line|awk '{print $NF}'` fi start_time=`date +%s` - date +%F\ %T | tee -a pytest-out.log + date +%F\ %T | tee -a $tests_dir/pytest-out.log echo -n $case $line > /dev/null 2>&1 && \ - echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \ - echo -e "${RED} failed${NC}" | tee -a pytest-out.log + echo -e "${GREEN} success${NC}" | tee -a $tests_dir/pytest-out.log || \ + echo -e "${RED} failed${NC}" | tee -a $tests_dir/pytest-out.log end_time=`date +%s` out_log=`tail -1 pytest-out.log ` # if [[ $out_log =~ 'failed' ]];then # exit 8 # fi - echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log + echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $tests_dir/pytest-out.log else $line > /dev/null 2>&1 fi @@ -339,10 +339,9 @@ if [ "$2" != "sim" ] && [ "$2" != "jdbc" ] && [ "$2" != "unit" ] && [ "$2" != " export LD_LIBRARY_PATH=$TOP_DIR/$LIB_DIR:$LD_LIBRARY_PATH + [ -f $tests_dir/pytest-out.log ] && rm -f $tests_dir/pytest-out.log cd $tests_dir/pytest - [ -f pytest-out.log ] && rm -f pytest-out.log - if [ "$1" == "cron" ]; then echo "### run Python regression test ###" runPyCaseOneByOne regressiontest.sh