From: Tarun Kumar <tarun1.kumar@samsung.com>
Date: Fri, 18 Aug 2023 08:30:32 +0000 (+0530)
Subject: [TCT][scripts][Non-ACR] Rootstrap and exclude.list issue fixed
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8c12d7a18a2a4a2a2342efe7959ac5530eb452c;p=test%2Ftct%2Fnative%2Fapi.git

[TCT][scripts][Non-ACR] Rootstrap and exclude.list issue fixed

Change-Id: If31246166730fd25fe2410b67aafdc136772d9ac
Signed-off-by: Tarun Kumar <tarun1.kumar@samsung.com>
---

diff --git a/scripts_tpk/retriever.py b/scripts_tpk/retriever.py
index 95cb81228..6406069ea 100755
--- a/scripts_tpk/retriever.py
+++ b/scripts_tpk/retriever.py
@@ -182,6 +182,8 @@ def tc_anum2(TC_FILES):
 			src.seek(0)
 			for line_in_list in src:
 				stripped_line=line_in_list.strip('\n')
+				if len(stripped_line)==0:
+					continue
 				#for profile
 				if(stripped_line.startswith('##') and stripped_line.endswith('##')):
 					end_hash_index = stripped_line.find('##',2)
@@ -194,7 +196,7 @@ def tc_anum2(TC_FILES):
 					else:
 						checking = False
 				#for build_type
-				if(checking == True and stripped_line.startswith(TYPE)):
+				if(checking == True and stripped_line.startswith(TYPE+":")):
 					tc_name_index = stripped_line.find(':')
 					tc_name = stripped_line[tc_name_index+1:]
 					if (test1.find(tc_name)>=0):
diff --git a/scripts_tpk/tctestsgen.py b/scripts_tpk/tctestsgen.py
index 13a46ce39..39f1a5f67 100755
--- a/scripts_tpk/tctestsgen.py
+++ b/scripts_tpk/tctestsgen.py
@@ -157,6 +157,8 @@ if os.path.exists('exclude.list'):
 		src.seek(0)
 		for line_in_list in src:
 			stripped_line=line_in_list.strip()
+			if len(stripped_line)==0:
+				continue
 			#for profile
 			if(stripped_line.startswith('##') and stripped_line.endswith('##')):
 				end_hash_index = stripped_line.find('##',2)
@@ -169,7 +171,7 @@ if os.path.exists('exclude.list'):
 				else:
 					checking = False
 			#for build_type
-			if(checking == True and stripped_line.startswith(BUILD_TYPE)):
+			if(checking == True and stripped_line.startswith(BUILD_TYPE+':')):
 				tc_name_index = stripped_line.find(':')
 				tc_name = stripped_line[tc_name_index+1:]
 				if (test1.find(tc_name)>=0):
diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index ed870a8bf..00aa3ec31 100755
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -580,7 +580,7 @@ getlatestrootstrap() {
 	ROOTSTRAP_STRING_ARRAY=($ROOTSTRAP_LIST)
 	for ROOTSTRAP_NAME in "${ROOTSTRAP_STRING_ARRAY[@]}";
 	do
-		DATE_STR="cut -d'.' -f5 <<<$ROOTSTRAP_NAME"  #extracting date string from rootstrap name and finding the latest date and rootstrap
+		DATE_STR=`cut -d'.' -f 5 <<<$ROOTSTRAP_NAME`  #extracting date string from rootstrap name and finding the latest date and rootstrap
 		if [[ "$DATE_STR" > "$LATEST_DATE" ]] && [[ ! -z "$DATE_STR" ]];  then
 			LATEST_DATE=$DATE_STR
 			EXISTING_ROOTSTRAP=$ROOTSTRAP_NAME