Skip to content
Snippets Groups Projects
Commit 28dae909 authored by Rohit Gupta's avatar Rohit Gupta
Browse files

fix for excluding tests listed in xml file

parent ff706ab0
No related branches found
No related tags found
No related merge requests found
...@@ -388,6 +388,7 @@ until [ -z "$1" ] ...@@ -388,6 +388,7 @@ until [ -z "$1" ]
-g | --run-group) -g | --run-group)
RUN_GROUP=1 RUN_GROUP=1
test_case_group=$2 test_case_group=$2
test_case_group=`sed "s/\+/\*/g" <<< "${test_case_group}"` # Replace + with * for bash string substituion
echo_info "Will execute test cases only in group $test_case_group" echo_info "Will execute test cases only in group $test_case_group"
shift 2;; shift 2;;
-p) -p)
...@@ -423,9 +424,17 @@ rm -fr $tmpfile ...@@ -423,9 +424,17 @@ rm -fr $tmpfile
xml_conf="$OPENAIR_DIR/cmake_targets/autotests/test_case_list.xml" xml_conf="$OPENAIR_DIR/cmake_targets/autotests/test_case_list.xml"
test_case_list=`xmlstarlet sel -T -t -m /testCaseList/testCase -s A:N:- "@id" -v "@id" -n $xml_conf` test_case_list=`xmlstarlet sel -T -t -m /testCaseList/testCase -s A:N:- "@id" -v "@id" -n $xml_conf`
test_case_excl_list=`xmlstarlet sel -t -v "/testCaseList/TestCaseExclusionList" $xml_conf`
echo "Test Case Exclusion List = $test_case_excl_list "
test_case_excl_list=`sed "s/\+/\*/g" <<< "$test_case_excl_list" ` # Replace + with * for bash string substituion
read -a test_case_excl_array <<< "$test_case_excl_list"
echo "test_case_list = $test_case_list" echo "test_case_list = $test_case_list"
echo "Test Case Exclusion List = $test_case_excl_list \n"
readarray -t test_case_array <<<"$test_case_list" readarray -t test_case_array <<<"$test_case_list"
read -a test_case_group_array <<< "$test_case_group" read -a test_case_group_array <<< "$test_case_group"
...@@ -447,6 +456,15 @@ for search_expr in "${test_case_array[@]}" ...@@ -447,6 +456,15 @@ for search_expr in "${test_case_array[@]}"
flag_run_test_case=1 flag_run_test_case=1
fi fi
for search_excl in "${test_case_excl_array[@]}"
do
if [[ $search_expr == $search_excl ]];then
flag_run_test_case=0
echo_info "Test case $search_expr match found in test case excl group. Will skip the test case for execution..."
break
fi
done
#We skip this test case if it is not in the group list #We skip this test case if it is not in the group list
if [ "$flag_run_test_case" -ne "1" ]; then if [ "$flag_run_test_case" -ne "1" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment