diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index a46cf1f3a140ccb40b2965a07a735a2010f7687f..f56b21b1c4619995279162c4cb19fb62ae16796a 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -303,7 +303,7 @@ 20,,script,./test.sh -f general/parser/auto_create_tb_drop_tb.sim 20,,script,./test.sh -f general/import/basic.sim 20,2,script,./test.sh -f general/alter/dnode.sim -20,,script,./test.sh -f general/compute/cast.sim +20,,script,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test.sh -f general/compute/cast.sim; fi\" 20,,script,./test.sh -f general/compute/string_funcs.sim 20,,develop-test,python3 test.py -f 2-query/lower_func.py 20,,develop-test,python3 test.py -f 2-query/upper_func.py @@ -560,7 +560,7 @@ 10,,script,./test.sh -f unique/stable/replica2_vnode3.sim 10,,pytest,python3 testCompress.py 10,,pytest,python3 test.py -f client/client.py -10,,script,./test.sh -f general/parser/scalar_expression.sim +10,,script,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test.sh -f general/parser/scalar_expression.sim; fi\" 10,,script,./test.sh -f general/compute/scalar_pow.sim 9,,script,./test.sh -f general/parser/alter1.sim 9,,script,./test.sh -f general/db/delete.sim @@ -788,7 +788,7 @@ 3,,pytest,python3 test.py -f tag_lite/binary.py 3,,pytest,python3 test.py -f query/filterAllIntTypes.py 3,,develop-test,python3 ./test.py -f 2-query/ts_hidden_column.py -3,,script,./test.sh -f general/compute/scalar_triangle.sim +3,,script,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test.sh -f general/compute/scalar_triangle.sim; fi\" 3,,script,./test.sh -f general/compute/scalar_str_concat_len.sim 3,,develop-test,python3 ./test.py -f 2-query/function_tail.py 2,,develop-test,python3 ./test.py -f 2-query/function_unique.py diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index a9263929f4a2d5abd6048d2d93114ebecd45c9a9..221b70b22a7b17586be9ed04895e716b391f3b0e 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -272,10 +272,11 @@ function run_thread() { flock -x $lock_file -c "echo \"${hosts[index]} ret:${ret} ${line}\" >>$log_dir/failed.log" mkdir -p $log_dir/${case_file}.coredump local remote_coredump_dir="${workdirs[index]}/tmp/thread_volume/$thread_no/coredump" - cmd="sshpass -p ${passwords[index]} scp -o StrictHostKeyChecking=no ${usernames[index]}@${hosts[index]}:${remote_coredump_dir}/* $log_dir/${case_file}.coredump/" + local scpcmd="sshpass -p ${passwords[index]} scp -o StrictHostKeyChecking=no -r ${usernames[index]}@${hosts[index]}" if [ -z ${passwords[index]} ]; then - cmd="scp -o StrictHostKeyChecking=no ${usernames[index]}@${hosts[index]}:${remote_coredump_dir}/* $log_dir/${case_file}.coredump/" + scpcmd="scp -o StrictHostKeyChecking=no -r ${usernames[index]}@${hosts[index]}" fi + cmd="$scpcmd:${remote_coredump_dir}/* $log_dir/${case_file}.coredump/" $cmd # 2>/dev/null local case_info=`echo "$line"|cut -d, -f 3,4` local corefile=`ls $log_dir/${case_file}.coredump/` @@ -287,6 +288,15 @@ function run_thread() { echo -e "\e[34m log file: $log_dir/$case_file.log \e[0m" if [ ! -z "$corefile" ]; then echo -e "\e[34m corefiles: $corefile \e[0m" + local build_dir=$log_dir/build_${hosts[index]} + local remote_build_dir="${workdirs[index]}/TDinternal/debug/build" + mkdir $build_dir 2>/dev/null + if [ $? -eq 0 ]; then + # scp build binary + cmd="$scpcmd:${remote_build_dir}/* ${build_dir}/" + echo "$cmd" + $cmd >/dev/null + fi fi fi done