[=]fix casetest error

alibaba · Oct 25, 2024 · 31b14df · 31b14df
1 parent 6822275
commit 31b14df
Show file tree

Hide file tree

Showing 2 changed files with 165 additions and 164 deletions.
diff --git a/scripts/case_test.sh b/scripts/case_test.sh
@@ -4412,169 +4412,6 @@ else
     case_print_result "h3_engine_set_settings_api_h3_ext_more" "fail"
 fi
 
-sudo rm -rf tp_localhost test_session xqc_token clog slog
-killall test_server 2> /dev/null
-${SERVER_BIN} -l d -e -f > /dev/null &
-sleep 1
-
-rm -rf tp_localhost test_session xqc_token
-echo -e "negotiate_encoder_fec_schemes ...\c"
-sudo ${CLIENT_BIN} -l d -g > stdlog
-clog_res1=`grep "|xqc_negotiate_fec_schemes|set final encoder fec scheme: XOR" clog`
-slog_res1=`grep "|xqc_negotiate_fec_schemes|set final encoder fec scheme: XOR" slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$clog_res1" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "negotiate_encoder_fec_scheme" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "negotiate_encoder_fec_scheme" "fail"
-fi
-
-
-rm -rf tp_localhost test_session xqc_token
-echo -e "negotiate_decoder_fec_schemes ...\c"
-sudo ${CLIENT_BIN} -l d -g > stdlog
-clog_res2=`grep "|xqc_negotiate_fec_schemes|set final decoder fec scheme: XOR" clog`
-slog_res2=`grep "|xqc_negotiate_fec_schemes|set final decoder fec scheme: XOR" slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$clog_res2" ] && [ -n "$slog_res2" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "negotiate_decoder_fec_scheme" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "negotiate_decoder_fec_scheme" "fail"
-fi
-
-
-clear_log
-killall test_server 2> /dev/null
-stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
-sleep 1
-
-rm -rf tp_localhost test_session xqc_token
-echo -e "check fec recovery function of stream using XOR ...\c"
-sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo > stdlog
-slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_stream_xor" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_stream_xor" "fail"
-fi
-
-clear_log
-killall test_server 2> /dev/null
-stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
-sleep 1
-
-rm -rf tp_localhost test_session xqc_token
-echo -e "check fec recovery function of stream using RSC ...\c"
-sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo --fec_encoder 8 --fec_decoder 8 > stdlog
-slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_stream_rsc" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_stream_rsc" "fail"
-fi
-
-clear_log
-killall test_server 2> /dev/null
-stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
-sleep 1
-
-rm -rf tp_localhost test_session xqc_token
-echo -e "check fec recovery function of stream using PM ...\c"
-sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo --fec_encoder 12 --fec_decoder 12 > stdlog
-slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_stream_pm" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_stream_pm" "fail"
-fi
-
-
-
-killall test_server 2> /dev/null
-${SERVER_BIN} -l d -Q 65535 -e -U 1 -s 1 --dgram_qos 3 -f > /dev/null &
-sleep 1
-
-rm -rf tp_localhost test_session xqc_token
-
-clear_log
-echo -e "check fec recovery function of datagram with XOR fec scheme ...\c"
-sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g > stdlog
-slog_res1=`grep '|process packet of block 0 successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_datagram_xor" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_datagram_xor" "fail"
-fi
-
-clear_log
-echo -e "check fec recovery function of datagram with RSC fec scheme ...\c"
-sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 8 --fec_decoder 8  > stdlog
-slog_res1=`grep '|process packet of block 0 successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_datagram_rsc" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_datagram_rsc" "fail"
-fi
-
-clear_log
-echo -e "check fec recovery function of datagram with Packet Mask scheme ...\c"
-sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 12 --fec_decoder 12  > stdlog
-slog_res1=`grep '|process packet of block 0 successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_datagram_pm" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_datagram_pm" "fail"
-fi
-
-clear_log
-echo -e "check fec recovery function of datagram with XOR(encoder) and RSC(decoder) fec schemes ...\c"
-sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 8 --fec_decoder 11 > stdlog
-slog_res1=`grep '|process packet of block 0 successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_datagram_xor_and_rsc" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_datagram_xor_and_rsc" "fail"
-fi
-
-
-clear_log
-echo -e "check fec recovery function of datagram with XOR(decoder) and RSC(encoder) fec schemes ...\c"
-sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 11 --fec_decoder 8 > stdlog
-slog_res1=`grep '|process packet of block 0 successfully' slog`
-errlog=`grep_err_log`
-if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
-    echo ">>>>>>>> pass:1"
-    case_print_result "fec_recovered_function_of_datagram_rsc_and_xor" "pass"
-else
-    echo ">>>>>>>> pass:0"
-    case_print_result "fec_recovered_function_of_datagram_rsc_and_xor" "fail"
-fi
-
 
 clear_log
 rm -rf tp_localhost test_session xqc_token
@@ -4757,6 +4594,170 @@ else
     echo "$errlog"
 fi
 
+sudo rm -rf tp_localhost test_session xqc_token clog slog
+killall test_server 2> /dev/null
+${SERVER_BIN} -l d -e -f > /dev/null &
+sleep 1
+
+rm -rf tp_localhost test_session xqc_token
+echo -e "negotiate_encoder_fec_schemes ...\c"
+sudo ${CLIENT_BIN} -l d -g > stdlog
+clog_res1=`grep "|xqc_negotiate_fec_schemes|set final encoder fec scheme: XOR" clog`
+slog_res1=`grep "|xqc_negotiate_fec_schemes|set final encoder fec scheme: XOR" slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$clog_res1" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "negotiate_encoder_fec_scheme" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "negotiate_encoder_fec_scheme" "fail"
+fi
+
+
+rm -rf tp_localhost test_session xqc_token
+echo -e "negotiate_decoder_fec_schemes ...\c"
+sudo ${CLIENT_BIN} -l d -g > stdlog
+clog_res2=`grep "|xqc_negotiate_fec_schemes|set final decoder fec scheme: XOR" clog`
+slog_res2=`grep "|xqc_negotiate_fec_schemes|set final decoder fec scheme: XOR" slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$clog_res2" ] && [ -n "$slog_res2" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "negotiate_decoder_fec_scheme" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "negotiate_decoder_fec_scheme" "fail"
+fi
+
+
+clear_log
+killall test_server 2> /dev/null
+stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
+sleep 1
+
+rm -rf tp_localhost test_session xqc_token
+echo -e "check fec recovery function of stream using XOR ...\c"
+sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo > stdlog
+slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_stream_xor" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_stream_xor" "fail"
+fi
+
+clear_log
+killall test_server 2> /dev/null
+stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
+sleep 1
+
+rm -rf tp_localhost test_session xqc_token
+echo -e "check fec recovery function of stream using RSC ...\c"
+sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo --fec_encoder 8 --fec_decoder 8 > stdlog
+slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_stream_rsc" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_stream_rsc" "fail"
+fi
+
+clear_log
+killall test_server 2> /dev/null
+stdbuf -oL ${SERVER_BIN} -l d -e -f -x 1 -M > /dev/null &
+sleep 1
+
+rm -rf tp_localhost test_session xqc_token
+echo -e "check fec recovery function of stream using PM ...\c"
+sudo ${CLIENT_BIN} -s 5120000 -l e -E -d 30 -g -M -i lo -i lo --fec_encoder 12 --fec_decoder 12 > stdlog
+slog_res1=`grep '|process packet of block .\{1,3\} successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_stream_pm" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_stream_pm" "fail"
+fi
+
+
+
+killall test_server 2> /dev/null
+${SERVER_BIN} -l d -Q 65535 -e -U 1 -s 1 --dgram_qos 3 -f > /dev/null &
+sleep 1
+
+rm -rf tp_localhost test_session xqc_token
+
+clear_log
+echo -e "check fec recovery function of datagram with XOR fec scheme ...\c"
+sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g > stdlog
+slog_res1=`grep '|process packet of block 0 successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_datagram_xor" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_datagram_xor" "fail"
+fi
+
+clear_log
+echo -e "check fec recovery function of datagram with RSC fec scheme ...\c"
+sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 8 --fec_decoder 8  > stdlog
+slog_res1=`grep '|process packet of block 0 successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_datagram_rsc" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_datagram_rsc" "fail"
+fi
+
+clear_log
+echo -e "check fec recovery function of datagram with Packet Mask scheme ...\c"
+sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 12 --fec_decoder 12  > stdlog
+slog_res1=`grep '|process packet of block 0 successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_datagram_pm" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_datagram_pm" "fail"
+fi
+
+clear_log
+echo -e "check fec recovery function of datagram with XOR(encoder) and RSC(decoder) fec schemes ...\c"
+sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 8 --fec_decoder 11 > stdlog
+slog_res1=`grep '|process packet of block 0 successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_datagram_xor_and_rsc" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_datagram_xor_and_rsc" "fail"
+fi
+
+
+clear_log
+echo -e "check fec recovery function of datagram with XOR(decoder) and RSC(encoder) fec schemes ...\c"
+sudo ${CLIENT_BIN} -l d -T 1 -s 10000 -U 1 -Q 65535 -E -x 205 -N -1 -t 1 --dgram_qos 3 -g --fec_encoder 11 --fec_decoder 8 > stdlog
+slog_res1=`grep '|process packet of block 0 successfully' slog`
+errlog=`grep_err_log`
+if [ -z "$errlog" ] && [ -n "$slog_res1" ]; then
+    echo ">>>>>>>> pass:1"
+    case_print_result "fec_recovered_function_of_datagram_rsc_and_xor" "pass"
+else
+    echo ">>>>>>>> pass:0"
+    case_print_result "fec_recovered_function_of_datagram_rsc_and_xor" "fail"
+fi
+
+
 killall test_server
 
 cd -
diff --git a/scripts/xquic_test.sh b/scripts/xquic_test.sh
@@ -78,7 +78,7 @@ function run_test_case() {
 
 function run_gcov() {
     #output coverage summary
-    gcovr -r .. | tee -a xquic_test.log
+    gcovr --gcov-ignore-parse-errors -r .. | tee -a xquic_test.log
 }
 
 function output_summary() {