From: Sanghoon Lee Date: Tue, 16 Apr 2019 06:48:11 +0000 (+0900) Subject: [Non-ACR][Template][Updated installation logic of test application] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c30adf335f8e002b4997ba1cb757fe4fae6871f0;p=test%2Ftct%2Fcsharp%2Fapi.git [Non-ACR][Template][Updated installation logic of test application] Change-Id: Ib03b6078286d808fe15cd901a4aeed15ddcb0697 --- diff --git a/tool/script/template/inst.py b/tool/script/template/inst.py index 2768a888e..ab8dc9d41 100755 --- a/tool/script/template/inst.py +++ b/tool/script/template/inst.py @@ -172,12 +172,27 @@ def askpolicyremoving(): if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)): action_status = False if PARAMETERS.mode == "SDB": - cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, + cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, SRC_DIR, pkg_id) return doCMD(cmd) + +def checkPlatformArch(config_key): + (return_code, output) = doRemoteCMD("cat /etc/config/model-config.xml | grep %s" % (config_key)) + output_len = len(output) + + if output_len == 0: + return False + + for out in output: + if config_key in out: + if 'true' in out: + return True + return False + + def instPKGs(): - action_status = True + action_status = True (return_code, output) = doRemoteCMD( "mkdir -p /home/owner/share/res") (return_code, output) = doRemoteCMD( @@ -230,8 +245,28 @@ def instPKGs(): elif file.endswith(".tpk"): if not doRemoteCopy(root + '/' + file, "%s/%s" % (SRC_DIR, file)): action_status = False - (return_code, output) = doRemoteCMD( - "pkgcmd -i -t tpk -q -p %s/%s" % (SRC_DIR, file)) + + if file.endswith("-x86.tpk"): + x86_ret = checkPlatformArch('tizen.org/feature/platform.core.cpu.arch.x86') + + if x86_ret: + (return_code, output) = doRemoteCMD("pkgcmd -i -t tpk -q -p %s/%s" % (SRC_DIR, file)) + else: + print("Skipped installation on this platform. file name is %s" % (file)) + + elif file.endswith("-arm.tpk"): + armv7_ret = checkPlatformArch('tizen.org/feature/platform.core.cpu.arch.armv7') + armv6_ret = checkPlatformArch('tizen.org/feature/platform.core.cpu.arch.armv6') + + if armv7_ret or armv6_ret: + (return_code, output) = doRemoteCMD("pkgcmd -i -t tpk -q -p %s/%s" % (SRC_DIR, file)) + else: + print("Skipped installation on this platform. file name is %s" % (file)) + + else: + (return_code, output) = doRemoteCMD( + "pkgcmd -i -t tpk -q -p %s/%s" % (SRC_DIR, file)) + if file == "org.tizen.MsgPortApp.Tizen-1.0.0.tpk": (return_code, output) = doRemoteCMD("app_launcher -s %s" % ("org.tizen.MsgPortApp.Tizen")) elif file == "org.tizen.MsgPortApp1.Tizen-1.0.0.tpk":