[NativeTCT][Non-ACR] Changes for path creation based on architecture - fix

Change-Id: I7153b4b3e7921b7a405a3f2fbb6bc06eb48d6def
Signed-off-by: Ankit Srivastava <ankit.sri1@samsung.com>

diff --git a/scripts_tpk/tcpackageslistsgen.py b/scripts_tpk/tcpackageslistsgen.py
index 2a6ad6a10525413df07cc0a6834fb546325f6413..d270e35af50e1ecae8435fe0b0d1389bba9e6970 100755 (executable)
--- a/scripts_tpk/tcpackageslistsgen.py
+++ b/scripts_tpk/tcpackageslistsgen.py
@@ -90,7 +90,7 @@ if ( path.exists(FILE) == False ):
        exit('No such file: '+FILE)
 
 MODULE_NAME_MOD=MODULE_NAME+'-native-'+TYPE
-WORKSPACE_SRC_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+PROFILE+dirSeparator+MODULE_NAME_MOD
+WORKSPACE_SRC_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+PROFILE+'_'+ARCH+dirSeparator+MODULE_NAME_MOD
 
 CATEGORY='IntegrationTestCases'
 if ( TYPE == 'utc' ):

diff --git a/scripts_tpk/tctestsgen.py b/scripts_tpk/tctestsgen.py
index 767c4b0e34c86bbee5570ee31fdc825c6d79210f..13a46ce39c0399e45516b52782bd33d4547ef214 100755 (executable)
--- a/scripts_tpk/tctestsgen.py
+++ b/scripts_tpk/tctestsgen.py
@@ -99,7 +99,7 @@ MODULE_NAME_MOD=MODULE_NAME+'-native-'+BUILD_TYPE
 MODULE_FULL_NAME='org.tizen.'+MODULE_NAME_MOD
 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
+WORKSPACE_SRC_DIR=getenv('HOME')+dirSeparator+'workspace'+'_'+profile+'_'+arch+dirSeparator+MODULE_NAME_MOD
 PACKAGING_DIR =SCRIPT_DIR+dirSeparator+".."+dirSeparator+"packaging"+dirSeparator+BUILD_TYPE+dirSeparator
 
 FILE=argv[3]+dirSeparator+'tests.xml'

diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py
index 4d86dc1c14710e948eda589330526f9d96e03ed5..348054036e0c0d70b94ba45f32042ff2bc9a9c0c 100755 (executable)
--- a/scripts_tpk/tpk-install.py
+++ b/scripts_tpk/tpk-install.py
@@ -238,7 +238,7 @@ if ( OS == 'Windows' ):
 
 PROJECT_DIR=(os.path.abspath(os.path.dirname(sys.argv[0])))
 TPK_DIR=os.getenv('HOME')+dirSeparator+'tpks'
-WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]
+WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]+'_'+sys.argv[1]
 
 # TODO use argparse
 if ( len(sys.argv) >= 2 ):

diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py
index 6549f3a3daa0c2482792a0b1ba76d764f77769ec..c1772fe1eb568b3ba56b79511c13d01a9324aceb 100755 (executable)
--- a/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@ -223,7 +223,7 @@ if ( OS == 'Windows' ):
 
 PROJECT_DIR=(os.path.abspath(os.path.dirname(sys.argv[0])))
 TPK_DIR=os.getenv('HOME')+dirSeparator+'tpks'
-WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]
+WORKSPACE_DIR=os.getenv('HOME')+dirSeparator+'workspace'+'_'+ sys.argv[2]+'_'+sys.argv[1]
 
 # TODO use argparse
 if ( len(sys.argv) >= 2 ):