From: Ankit Srivastava <ankit.sri1@samsung.com>
Date: Mon, 18 Jul 2022 04:31:34 +0000 (+0530)
Subject: [NativeTCT][Non-ACR] Changes for path creation based on architecture - fix
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc33ef0d93e613f8694574512b62025b437d4fea;p=test%2Ftct%2Fnative%2Fapi.git

[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 2a6ad6a10..d270e35af 100755
--- 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 767c4b0e3..13a46ce39 100755
--- 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 4d86dc1c1..348054036 100755
--- 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 6549f3a3d..c1772fe1e 100755
--- 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 ):