[TCT][scripts][NonACR][Added changes for tizen 6.5 branch in tool and scripts]

Change-Id: I898132cdcfe13bcfd7b475b247e935a87b6327c5
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/scripts_tpk/child-package-generator.sh b/scripts_tpk/child-package-generator.sh
old mode 100755 (executable)
new mode 100644 (file)
index 4469a84..5923981
--- a/scripts_tpk/child-package-generator.sh
+++ b/scripts_tpk/child-package-generator.sh
@@ -13,9 +13,9 @@ if [ $BUILD_TC_TYPE = "utc" ]; then
         PREFIX="core"
 fi
 
-TIZEN____="tizen_native_6.0"
+TIZEN____="tizen_native_6.5"
 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-6.0.zip"
+TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-6.5.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="    <auto_tcn>$tc_count</auto_tcn>"
                        PKG_INFO_3="    <manual_tcn>0</manual_tcn>"
                        PKG_INFO_4="    <total_tcn>$tc_count</total_tcn>"
-                       PKG_INFO_5="    <pkg_name>$BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-6.0.zip</pkg_name>"
+                       PKG_INFO_5="    <pkg_name>$BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-6.5.zip</pkg_name>"
                        PKG_INFO_6="  </suite>"
                        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-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/
+       zip -r tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-6.5.zip opt > /dev/null 2>&1;
+       cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-6.5.zip $ZIP_PKG_DIR/
        cd ..
 
        CURRENT_LOOP_COUNT=$((CURRENT_LOOP_COUNT+1))

diff --git a/scripts_tpk/tcpackageslistsgen.py b/scripts_tpk/tcpackageslistsgen.py
old mode 100755 (executable)
new mode 100644 (file)
index 281ef66..2ab70f1
--- a/scripts_tpk/tcpackageslistsgen.py
+++ b/scripts_tpk/tcpackageslistsgen.py
@@ -31,7 +31,7 @@ def regen():
                                tf.write('    <auto_tcn>'+AUTO_NUM+'</auto_tcn>\n')
                                tf.write('    <manual_tcn>'+MAN_NUM+'</manual_tcn>\n')
                                tf.write('    <total_tcn>'+TOT_NUM+'</total_tcn>\n')
-                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.0.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.5.zip</pkg_name>\n')
                                tf.write('  </suite>\n')
 
                                found = 0;
@@ -50,7 +50,7 @@ def regen():
                                tf.write('    <auto_tcn>'+AUTO_NUM+'</auto_tcn>\n')
                                tf.write('    <manual_tcn>'+MAN_NUM+'</manual_tcn>\n')
                                tf.write('    <total_tcn>'+TOT_NUM+'</total_tcn>\n')
-                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.0.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-6.5.zip</pkg_name>\n')
                                tf.write('  </suite>\n')
                                tf.write(line+'\n')
                        else:

diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py
old mode 100755 (executable)
new mode 100644 (file)
index 6a7ac56..84b1b2f
--- 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_6.0'
+                       TIZEN____='tizen_native_6.5'
                        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+'-6.0.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-6.5.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+'-6.0.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.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+'-6.0.zip', TO_PKG_DIR+dirSeparator+PROFILE)
+                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.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/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
old mode 100755 (executable)
new mode 100644 (file)
index 40d80e4..7817698
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -360,7 +360,7 @@ function rm_module {
                PREFIX="core"
        fi
 
-       TIZEN____="tizen_native_6.0"
+       TIZEN____="tizen_native_6.5"
 
        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
old mode 100755 (executable)
new mode 100644 (file)
index 86c22a8..ce177f1
--- 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_6.0'
+                       TIZEN____='tizen_native_6.5'
                        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+'-6.0.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-6.5.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+'-6.0.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.0.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.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+'-6.0.zip', TO_PKG_DIR+dirSeparator+PROFILE)
+                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-6.5.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/tool/NativeTCT_6.0.tar.gz b/tool/NativeTCT_6.0.tar.gz
deleted file mode 100644 (file)
index 867786b..0000000
Binary files a/tool/NativeTCT_6.0.tar.gz and /dev/null differ

diff --git a/tool/NativeTCT_6.0_tizeniot.tar.gz b/tool/NativeTCT_6.0_tizeniot.tar.gz
deleted file mode 100644 (file)
index a000150..0000000
Binary files a/tool/NativeTCT_6.0_tizeniot.tar.gz and /dev/null differ

diff --git a/tool/NativeTCT_6.5.tar.gz b/tool/NativeTCT_6.5.tar.gz
new file mode 100755 (executable)
index 0000000..7b41864
Binary files /dev/null and b/tool/NativeTCT_6.5.tar.gz differ