From: manoj Date: Wed, 6 Nov 2019 10:23:51 +0000 (+0530) Subject: [scripts_tpk][changes for porting to tizen 6.0] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6d19bbfe01416c4ece7fd5fe17f746a01450de6;p=test%2Ftct%2Fnative%2Fapi.git [scripts_tpk][changes for porting to tizen 6.0] Change-Id: Icf1ca5016937d85a8751f52827614eebae8bb992 Signed-off-by: manoj --- diff --git a/scripts_tpk/child-package-generator.sh b/scripts_tpk/child-package-generator.sh index 92856c202..6215a0889 100755 --- a/scripts_tpk/child-package-generator.sh +++ b/scripts_tpk/child-package-generator.sh @@ -1,4 +1,4 @@ -PROJECT_DIR="$(cd "$(dirname $0)" && pwd)" +PROJECT_DIR="$(cd "$(dirname $0)" && pwd" BUILD_TC_TYPE=$1 MOD_NAME=$2 BUILD_DEVICE_TYPE=$3 @@ -13,9 +13,9 @@ if [ $BUILD_TC_TYPE = "utc" ]; then PREFIX="core" fi -TIZEN____="tizen_native_5.5" +TIZEN____="tizen_native_6.0" TCT_PKG="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME" -TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-5.5.zip" +TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-6.0.zip" ZIP_PKG_DIR="/opt/tct/$TIZEN____/packages/$BUILD_DEVICE_TYPE" PKG_INFO="_pkg_info.xml" PKG_INFO_FILE_LOC="/opt/tct/$TIZEN____/packages/pkg_infos/$BUILD_DEVICE_TYPE$PKG_INFO" @@ -147,7 +147,7 @@ do PKG_INFO_2=" $tc_count" PKG_INFO_3=" 0" PKG_INFO_4=" $tc_count" - PKG_INFO_5=" $BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-5.5.zip" + PKG_INFO_5=" $BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-6.0.zip" PKG_INFO_6=" " echo $PKG_INFO_1 >> $PKG_INFO_FILE\_NEW echo $PKG_INFO_2 >> $PKG_INFO_FILE\_NEW @@ -180,8 +180,8 @@ do rm ./opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT/tests.xml cp ../../$TEST_XML_FILE\_$CURRENT_LOOP_COUNT ./opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT/$TEST_XML_FILE - zip -r tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-5.5.zip opt > /dev/null 2>&1; - cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-5.5.zip $ZIP_PKG_DIR/ + zip -r tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-6.0.zip opt > /dev/null 2>&1; + cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-6.0.zip $ZIP_PKG_DIR/ cd .. CURRENT_LOOP_COUNT=$((CURRENT_LOOP_COUNT+1)) diff --git a/scripts_tpk/tcpackageslistsgen.py b/scripts_tpk/tcpackageslistsgen.py index 955d553fb..281ef6647 100755 --- a/scripts_tpk/tcpackageslistsgen.py +++ b/scripts_tpk/tcpackageslistsgen.py @@ -31,7 +31,7 @@ def regen(): tf.write(' '+AUTO_NUM+'\n') tf.write(' '+MAN_NUM+'\n') tf.write(' '+TOT_NUM+'\n') - tf.write(' '+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-5.5.zip\n') + tf.write(' '+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.0.zip\n') tf.write(' \n') found = 0; @@ -50,7 +50,7 @@ def regen(): tf.write(' '+AUTO_NUM+'\n') tf.write(' '+MAN_NUM+'\n') tf.write(' '+TOT_NUM+'\n') - tf.write(' '+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-5.5.zip\n') + tf.write(' '+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.0.zip\n') tf.write(' \n') tf.write(line+'\n') else: diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py index 24ac92d14..6a7ac5696 100755 --- a/scripts_tpk/tpk-install.py +++ b/scripts_tpk/tpk-install.py @@ -84,7 +84,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): PKG_FNAME=PKG_VNAME+'.tpk' if ( os.path.exists(TPK_DIR+dirSeparator+PKG_FNAME) == False): sys.exit('Package Not Found '+PKG_VNAME) - TIZEN____='tizen_native_5.5' + TIZEN____='tizen_native_6.0' TCT_DIR='opt'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE TO_PKG_DIR=dirSeparator+'opt'+dirSeparator+'tct'+dirSeparator+TIZEN____+dirSeparator+'packages' @@ -170,7 +170,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): gentestsxml.gentestxmlfile(dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator, TC_COUNT) # zip - print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-5.5.zip file') + print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-6.0.zip file') # clear old zips removeDir(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages') @@ -178,14 +178,14 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): # create new zip #os.chdir(dirSeparator+'tmp') - zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip', True, dirSeparator) + zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip', True, dirSeparator) # deployment print('-- Suite deployment...') - print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip') + print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip') if ( os.path.exists(TO_PKG_DIR+dirSeparator+PROFILE) == False): os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE) - shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip', 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 ): diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh index a3373c047..fb0b8d308 100755 --- a/scripts_tpk/tpk_create.sh +++ b/scripts_tpk/tpk_create.sh @@ -633,7 +633,7 @@ if [ $PROFILE_TYPE == "tizeniot" ]; then fi echo "[APPLLICATION_PROFILE] : $APPLLICATION_PROFILE" -RunCommand "tizen create native-project -p $BUILD_PROFILE-5.0 -t $APPLLICATION_PROFILE -n $PROJECT_NAME -- $WORKSPACE_PATH" "Project creation $PROJECT_NAME" +RunCommand "tizen create native-project -p $BUILD_PROFILE-5.5 -t $APPLLICATION_PROFILE -n $PROJECT_NAME -- $WORKSPACE_PATH" "Project creation $PROJECT_NAME" deploySourceFile "$WORKSPACE_PATH/$PROJECT_NAME" "$SRC_DIRCTORY/$TESTCASE_TYPE/$MODULE_NAME" "$PROFILE_TYPE" "$PROJECT_NAME" "$TESTCASE_TYPE" "$MODULE_NAME" if [ $BUILD_PROFILE == "wearable" ]; then diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh index fc9d322eb..847677bc8 100755 --- a/scripts_tpk/tpkbuild.sh +++ b/scripts_tpk/tpkbuild.sh @@ -337,7 +337,7 @@ function rm_module { PREFIX="core" fi - TIZEN____="tizen_native_5.5" + TIZEN____="tizen_native_6.0" echo "Removing $BUILD_TYPE:->$MODULE_NAME module from project..." TO_PKG_DIR="/opt/tct/$TIZEN____/packages" diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py index d2d58fda9..86c22a857 100755 --- a/scripts_tpk/tpksdk-install.py +++ b/scripts_tpk/tpksdk-install.py @@ -83,7 +83,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): PKG_FNAME=PKG_VNAME+'.tpk' if ( os.path.exists(TPK_DIR+dirSeparator+PKG_FNAME) == False): sys.exit('Package Not Found '+PKG_VNAME) - TIZEN____='tizen_native_5.5' + TIZEN____='tizen_native_6.0' TCT_DIR='opt'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE TO_PKG_DIR=dirSeparator+'opt'+dirSeparator+'tct'+dirSeparator+TIZEN____+dirSeparator+'packages' @@ -160,7 +160,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): gentestsxml.gentestxmlfile(dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator, TC_COUNT) # zip - print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-5.5.zip file') + print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-6.0.zip file') # clear old zips removeDir(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages') @@ -168,14 +168,14 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): # create new zip #os.chdir(dirSeparator+'tmp') - zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip', True, dirSeparator) + zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip', True, dirSeparator) # deployment print('-- Suite deployment...') - print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip') + print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip') if ( os.path.exists(TO_PKG_DIR+dirSeparator+PROFILE) == False): os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE) - shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-5.5.zip', 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 ):