From: Ankit Date: Wed, 25 May 2022 09:22:29 +0000 (+0530) Subject: [NativeTCT][Non-ACR] scripts updation for python version 3.x support X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90266d6f71ba64393958dccec63e04f9cbc3204f;p=test%2Ftct%2Fnative%2Fapi.git [NativeTCT][Non-ACR] scripts updation for python version 3.x support Change-Id: If653b42590b8f1629794b4bd749efecccecaf7bf Signed-off-by: Ankit (cherry picked from commit 4346e7186174b4dbac6cb786f215f165c7bf7121) --- diff --git a/scripts_tpk/retriever.py b/scripts_tpk/retriever.py index a00f01a79..dbe96ad06 100755 --- a/scripts_tpk/retriever.py +++ b/scripts_tpk/retriever.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import argparse @@ -192,11 +192,11 @@ def tc_anum2(TC_FILES): shutil.copy(NEWFILE,TFILEPRE) #####exclude.list##### - f=file(TFILEPRE) + f=open(TFILEPRE,'r') for tc in f: TC_COUNT+=1 - - TC_CUSTOM_COUNT=int(argv[6]) + f.close() + TC_CUSTOM_COUNT=int(argv[6]) TC_COUNT = TC_COUNT * TC_CUSTOM_COUNT print(TC_COUNT) # os.system('cat '+TFILE+'_pre | sort -t\',\' -k2,2 -s > '+TFILE+'_remove') diff --git a/scripts_tpk/tcheadgen.py b/scripts_tpk/tcheadgen.py index 3f5e8aa55..423213138 100755 --- a/scripts_tpk/tcheadgen.py +++ b/scripts_tpk/tcheadgen.py @@ -1,13 +1,11 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import sys import platform import re -import commands import shutil from shutil import copy -from commands import getstatusoutput from os import path from sys import argv from sys import exit @@ -106,8 +104,8 @@ TFILE=dirSeparator+'tmp'+dirSeparator+'retr.csv' HEADER_NAME=argv[1].upper().replace('-', '_').replace('.', '_') SCRIPT_DIR=path.abspath(path.dirname(argv[0])) -status=getstatusoutput(SCRIPT_DIR+dirSeparator+'retriever.py -n '+argv[2]+' '+argv[3]+' > '+TFILE+'_pre') -if ( (status[0] % 256) != 0 ): +status, output=subprocess.getstatusoutput(SCRIPT_DIR+dirSeparator+'retriever.py -n '+argv[2]+' '+argv[3]+' > '+TFILE+'_pre') +if ( status > 0 ): tfile_pre=open(TFILE+'_pre') for line in tfile_pre: print(line.strip('\n')) diff --git a/scripts_tpk/tcpackageslistsgen.py b/scripts_tpk/tcpackageslistsgen.py index 281ef6647..0377360c0 100755 --- a/scripts_tpk/tcpackageslistsgen.py +++ b/scripts_tpk/tcpackageslistsgen.py @@ -1,13 +1,12 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import sys import platform import re -import commands +import subprocess import shutil from shutil import copy -from commands import getstatusoutput from os import path from sys import argv from sys import exit @@ -103,17 +102,17 @@ SCRIPT_DIR=path.abspath(path.dirname(argv[0])) cwd=os.getcwd() os.chdir(SCRIPT_DIR) os.chdir('..') -status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -anum '+WORKSPACE_SRC_DIR+' '+TYPE+' '+PROFILE+' '+MODULE_NAME+' '+str(TC_COUNT)+' '+ARCH) -if ( (status[0] % 256) != 0 ): - exit(status[1]) +status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -anum '+WORKSPACE_SRC_DIR+' '+TYPE+' '+PROFILE+' '+MODULE_NAME+' '+str(TC_COUNT)+' '+ARCH) +if ( status > 0 ): + exit(output) else: - AUTO_NUM=status[1] + AUTO_NUM=output -status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -mnum '+WORKSPACE_SRC_DIR+' '+TYPE+' '+PROFILE+' '+MODULE_NAME+' '+str(TC_COUNT)+' '+ARCH) -if ( (status[0] % 256) != 0 ): - exit(status[1]) +status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -mnum '+WORKSPACE_SRC_DIR+' '+TYPE+' '+PROFILE+' '+MODULE_NAME+' '+str(TC_COUNT)+' '+ARCH) +if ( status > 0 ): + exit(output) else: - MAN_NUM=status[1] + MAN_NUM=output TOT_NUM=str(int(AUTO_NUM)+int(MAN_NUM)) TFILE=dirSeparator+'tmp'+dirSeparator+'tempfile.xml' diff --git a/scripts_tpk/tctestsgen.py b/scripts_tpk/tctestsgen.py index a83203ac3..6985cdf70 100755 --- a/scripts_tpk/tctestsgen.py +++ b/scripts_tpk/tctestsgen.py @@ -1,9 +1,8 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import platform import sys -import commands import subprocess import re import shutil @@ -17,17 +16,17 @@ from xml.etree.ElementTree import parse def getFeature(): xml = PACKAGING_DIR - if(BUILD_TYPE=="ctc" or BUILD_TYPE=="itc"): - xml += "native-"+MODULE_NAME+"-"+BUILD_TYPE+".xml" - elif(BUILD_TYPE=="utc"): - xml += "core-"+MODULE_NAME+"-"+"tests"+".xml" - tree = parse(xml) - root = tree.getroot() - feature = [] - for child in root.iter("{http://tizen.org/ns/packages}feature"): + if(BUILD_TYPE=="ctc" or BUILD_TYPE=="itc"): + xml += "native-"+MODULE_NAME+"-"+BUILD_TYPE+".xml" + elif(BUILD_TYPE=="utc"): + xml += "core-"+MODULE_NAME+"-"+"tests"+".xml" + tree = parse(xml) + root = tree.getroot() + feature = [] + for child in root.iter("{http://tizen.org/ns/packages}feature"): if 'true' in child.text: feature.append(child.attrib["name"]) - return feature + return feature def gen(tcfile): # checking feature element @@ -98,7 +97,7 @@ TCT_CONFIG_FILE='/opt/tools/TCT_CONFIG' BUILD_TYPE=argv[1] MODULE_NAME_MOD=MODULE_NAME+'-native-'+BUILD_TYPE MODULE_FULL_NAME='org.tizen.'+MODULE_NAME_MOD -MODULE_NAME_C=capwords(MODULE_NAME, '-').translate(None, '-') +MODULE_NAME_C=capwords(MODULE_NAME, '-').replace('-', '') SCRIPT_DIR=path.abspath(path.dirname(argv[0])) WORKSPACE_SRC_DIR=getenv('HOME')+dirSeparator+'workspace'+'_'+profile+dirSeparator+MODULE_NAME_MOD PACKAGING_DIR =SCRIPT_DIR+dirSeparator+".."+dirSeparator+"packaging"+dirSeparator+BUILD_TYPE+dirSeparator @@ -113,9 +112,9 @@ if ( path.exists(TFILE) ): os.chdir(SCRIPT_DIR+dirSeparator+'..') # test this a bit -status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -f '+WORKSPACE_SRC_DIR+' '+BUILD_TYPE+' '+profile+' '+MODULE_NAME+' '+arch+' > '+TFILE+'_pre') -if ( (status[0] % 256) != 0 ): - tfil_pre=open(TFILE+'_pre') +status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'retriever.py -f '+WORKSPACE_SRC_DIR+' '+BUILD_TYPE+' '+profile+' '+MODULE_NAME+' '+arch+' > '+TFILE+'_pre') +if ( status > 0 ): + tfile_pre=open(TFILE+'_pre','r') for line in tfile_pre: print(line.strip('\n')) tfile_pre.close() diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py index bf62ab813..382dc0691 100755 --- a/scripts_tpk/tpk-install.py +++ b/scripts_tpk/tpk-install.py @@ -1,11 +1,10 @@ -#!/usr/bin/python +#!/usr/bin/python3 import platform import os import stat import sys import time -import commands import subprocess import re import argparse @@ -140,10 +139,8 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): # tests.xml print('---- Generating '+dirSeparator+'tmp'+dirSeparator+TCT_DIR) - status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'tctestsgen.py '+TYPE+' '+MODNAME+' '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' '+PROFILE+' '+ARCH) - if ( len(status[1]) > 0 ): - print(status[1]) - if ( ( status[0] % 256 ) != 0 ): + status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tctestsgen.py '+TYPE+' '+MODNAME+' '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' '+PROFILE+' '+ARCH) + if ( status > 0 ): print('Failed to execute tctestsgen.py!!!') sys.exit('Aborting...') @@ -187,9 +184,9 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE) shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip', TO_PKG_DIR+dirSeparator+PROFILE) print('---- Updating '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml') - status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH) - if ( len(status[1]) > 0 ): - print(status[1]) + status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH) + if ( status > 0 ): + print(status) if ( removeDir(TPK_DIR) == False ): sys.exit('Error removing '+TPK_DIR+'. Aborting...') print('**************Task finished successfully*********************') diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh index 913d5d977..b9551098d 100755 --- a/scripts_tpk/tpk_create.sh +++ b/scripts_tpk/tpk_create.sh @@ -225,9 +225,11 @@ deploySourceFile() { fi find . -type f ! -iname "*.c" ! -iname "*.cpp" ! -iname "*.h" ! -iname "CMakeLists.txt" -exec cp -p --parents {} $1/shared/res/. ";" cd $WORKDIR + if [ -d $2/res ];then cp -rf $2/res/* $1/res/. fi + if [ -d $2/res/$3 ];then cp -rf $2/res/$3/. $1/shared/res/. # As Profile specific resources has been copied from shared/res/res/ to shared/res location diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py index 86c22a857..07b15ca22 100755 --- a/scripts_tpk/tpksdk-install.py +++ b/scripts_tpk/tpksdk-install.py @@ -1,11 +1,10 @@ -#!/usr/bin/python +#!/usr/bin/python3 import platform import os import stat import sys import time -import commands import subprocess import re import argparse @@ -131,10 +130,8 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): # tests.xml print('---- Generating '+dirSeparator+'tmp'+dirSeparator+TCT_DIR) - status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'tctestsgen.py '+TYPE+' '+MODNAME+' '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' '+PROFILE+' '+ARCH) - if ( len(status[1]) > 0 ): - print(status[1]) - if ( ( status[0] % 256 ) != 0 ): + status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tctestsgen.py '+TYPE+' '+MODNAME+' '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' '+PROFILE+' '+ARCH) + if ( status > 0 ): print('Failed to execute tctestsgen.py!!!') sys.exit('Aborting...') @@ -177,9 +174,9 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE) shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip', TO_PKG_DIR+dirSeparator+PROFILE) print('---- Updating '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml') - status=commands.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH) - if ( len(status[1]) > 0 ): - print(status[1]) + status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH) + if ( status > 0 ): + print(status) if ( removeDir(TPK_DIR) == False ): sys.exit('Error removing '+TPK_DIR+'. Aborting...') print('**************Task finished successfully*********************')