From: Ankit Srivastava Date: Fri, 15 Jul 2022 10:21:54 +0000 (+0530) Subject: [NativeTCT][Non-ACR]Changes for path creation based on architecture X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a179d5bb2486e49e71d23b589fd13a81dd948b0;p=test%2Ftct%2Fnative%2Fapi.git [NativeTCT][Non-ACR]Changes for path creation based on architecture Change-Id: I22568a2a5defcb2fda6f2aff0488a5b5870b2807 Signed-off-by: Ankit Srivastava --- diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh index a1e7a1548..6eb87dce2 100755 --- a/scripts_tpk/tpk_create.sh +++ b/scripts_tpk/tpk_create.sh @@ -594,7 +594,11 @@ TIZENIOTMODULENAME="$2" ARCH_TYPE="$3" APPLLICATION_PROFILE="basic-ui" PROFILE_TYPE="$4" -WORKSPACE_PATH="$HOME/workspace_$PROFILE_TYPE" +if [ "$ARCH_TYPE" == "x86" ]; then + WORKSPACE_PATH="$HOME/workspace_${PROFILE_TYPE}_i586" +else + WORKSPACE_PATH="$HOME/workspace_${PROFILE_TYPE}_${ARCH_TYPE}" +fi CURRENT_VERSION="7.0" #####Check for architecture in case of TV profile########## diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh index a4b393586..47914b27e 100755 --- a/scripts_tpk/tpkbuild.sh +++ b/scripts_tpk/tpkbuild.sh @@ -18,6 +18,7 @@ PWD=`pwd` PROFILE_TYPE="" ARCH_TYPE="" +LOG_ARCH_TYPE="" TESTCASE_TYPE="" MODULE_NAME="" TC_COUNT="" @@ -63,12 +64,16 @@ fi if [ "$1" != "addmod" ] && [ "$1" != "rmmod" ]; then if [ "$2" = "armv7l" ] || [ "$3" = "armv7l" ] || [ "$4" = "armv7l" ] || [ "$5" = "armv7l" ]; then ARCH_TYPE="arm" + LOG_ARCH_TYPE="armv7l" elif [ "$2" = "x86" ] || [ "$3" = "x86" ] || [ "$4" = "x86" ] || [ "$5" = "x86" ]; then ARCH_TYPE="x86" + LOG_ARCH_TYPE="x86" elif [ "$2" = "aarch64" ] || [ "$3" = "aarch64" ] || [ "$4" = "aarch64" ] || [ "$5" = "aarch64" ]; then ARCH_TYPE="aarch64" + LOG_ARCH_TYPE="aarch64" elif [ "$2" = "x86_64" ] || [ "$3" = "x86_64" ] || [ "$4" = "x86_64" ] || [ "$5" = "x86_64" ]; then ARCH_TYPE="x86_64" + LOG_ARCH_TYPE="x86_64" else echo "Add argument '32 bit architecture (armv7l or x86)'" echo "Add argument '64 bit architecture (aarch64 or x86_64)'" @@ -107,17 +112,17 @@ function check_tc_type { function build { if [ "$#" -eq "2" ]; then - scripts_tpk/tpk_create.sh $1 $2 $ARCH_TYPE $PROFILE_TYPE | tee -a BuildLog/$1/$2.txt + scripts_tpk/tpk_create.sh $1 $2 $ARCH_TYPE $PROFILE_TYPE | tee -a BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/$1/$2.txt #below code remove the log file in case build is SUCCESS #keep the log file only for build FAILED modules while read LINE do if [[ $LINE =~ "CREATION SUCCESSFUL" ]] || [[ $LINE =~ "BUILD FAILED : Module doesn't exist" ]] || [[ $LINE =~ "'SKIPPING' THIS MODULE FROM BUILD PROCESS" ]]; then - rm BuildLog/$1/$2.txt + rm BuildLog_${PROFILE_TYPE}_${LOG_ARCH_TYPE}/$1/$2.txt break fi - done