From c00abdfbf631b9d72fce82ad883523a69d068038 Mon Sep 17 00:00:00 2001 From: jihun park Date: Fri, 28 Apr 2017 14:30:20 +0900 Subject: [PATCH] [UTC/ITC][Dali][Non-ACR][Patch for Dali with revert patch from 3.0] Change-Id: I756713057c137a835f4bca36825278e382fa4be8 Signed-off-by: jihun park --- ...external_wrapper_dali_multi_app_launch.sh} | 70 ++++---- scripts_tpk/tpk-install.py | 2 +- scripts_tpk/tpksdk-install.py | 2 +- .../dali-adaptor/tct-dali-adaptor-native.cpp | 30 ++-- src/itc/dali-core/tct-dali-core-native.cpp | 25 +-- .../dali-toolkit/tct-dali-toolkit-native.cpp | 25 +-- .../dali-adaptor/tct-dali-adaptor-core.cpp | 73 ++++----- src/utc/dali-core/tct-dali-core-core.cpp | 77 ++++----- .../dali-toolkit/tct-dali-toolkit-core.cpp | 151 +++++++++--------- .../tct-widget_viewer_dali-core.cpp | 58 ++++--- 10 files changed, 238 insertions(+), 275 deletions(-) rename scripts_tpk/{external_wrapper_dali_binary_launch.sh => external_wrapper_dali_multi_app_launch.sh} (62%) diff --git a/scripts_tpk/external_wrapper_dali_binary_launch.sh b/scripts_tpk/external_wrapper_dali_multi_app_launch.sh similarity index 62% rename from scripts_tpk/external_wrapper_dali_binary_launch.sh rename to scripts_tpk/external_wrapper_dali_multi_app_launch.sh index 6ebdde903..4560b2c1b 100755 --- a/scripts_tpk/external_wrapper_dali_binary_launch.sh +++ b/scripts_tpk/external_wrapper_dali_multi_app_launch.sh @@ -19,32 +19,17 @@ TIMEOUT_VALUE=60 #default timeout value FILE="/tmp/TC_Timeout.txt" -# extract TCT configuration directory from TCT_CONFIG_FILE (/home/owner/share/TCT_CONFIG) +# extract TCT configuration directory from TCT_CONFIG_FILE (/tmp/TCT_CONFIG) TCT_CONFIG_FILE=/home/owner/share/TCT_CONFIG if [ ! -f $TCT_CONFIG_FILE ];then echo "$TCT_CONFIG_FILE is not Found : Can Not Read TCT Configuration File to get Execution Mode" exit 1; fi DEVICE_EXECUTION_MODE_30=`cat $TCT_CONFIG_FILE | grep DEVICE_EXECUTION_MODE_30 | cut -f 2- -d '='` -ADMIN_USER_30=`cat $TCT_CONFIG_FILE | grep DEVICE_ADMIN_USER_30 | cut -f 2- -d '='` if [ $DEVICE_EXECUTION_MODE_30 == "" ]; then echo "'DEVICE_EXECUTION_MODE_30' key-value pair is not Found in $TCT_CONFIG_FILE. Unable to get Execution Mode" exit 1; fi -if [ $ADMIN_USER_30 == "" ]; then - echo "'ADMIN_USER_30' key-value pair is not Found in $TCT_CONFIG_FILE. Unable to get Admin User Mode" - exit 1; -fi -if [[ "$DEVICE_EXECUTION_MODE_30" == "$ADMIN_USER_30" ]]; then -APPS_ROOT=`cat $TCT_CONFIG_FILE | grep DEVICE_ADMIN_USER_APPS_ROOT_30 | cut -f 2- -d '='` -else -APPS_ROOT=`cat $TCT_CONFIG_FILE | grep DEVICE_OTHER_USER_APPS_ROOT_30 | cut -f 2- -d '='` -fi - -if [ $APPS_ROOT == "" ]; then - echo "'APPS_ROOT' is not Found through $TCT_CONFIG_FILE. Please check '$TCT_CONFIG_FILE'" - exit 1; -fi if [[ "$1" == "" || "$2" == "" || "$3" == "" ]]; then @@ -77,33 +62,47 @@ function Execute { rm -f $ERRLOG_PATH rm -f $UTC_LOG_CORE - #execute directly via tct binary - EXE_DIR=$APPS_ROOT/$1/bin - EXE_NAME=`echo $1 | sed -e 's/org\.tizen\.//g'` - echo "TCT Binary Path : $EXE_DIR/$EXE_NAME" - if [ ! -e $EXE_DIR/$EXE_NAME ]; - then - echo "TCT Binary does not exist at '$EXE_DIR'. Please check if package is installed properly" + RET=`su -c "app_launcher -s $1 testcase_name $2" $DEVICE_EXECUTION_MODE_30` + if [[ $RET != *"successfully launched"* ]];then + su -c "app_launcher -k $1 > /dev/null" $DEVICE_EXECUTION_MODE_30 exit 1 fi - #test case execution - cd $EXE_DIR - ./$EXE_NAME $2 - COUNTER=0 + i=0 + TIME_OUT=0 while [ ! -e $RESULT_PATH ]; do if [ $COUNTER -eq $TIMEOUT_VALUE ]; then - # terminate launched application - echo "Timeout! [ Execution exceeded $TIMEOUT_VALUE seconds ]" - KillPackage $1 - exit 1 + TIME_OUT=1 + break fi - sleep 1 - COUNTER=$(($COUNTER + 1)) + for i in {1..20} + do + sleep 0.1 + RE=`su -c "app_launcher -r $1 " $DEVICE_EXECUTION_MODE_30` + if [[ $RE == *"result: running"* ]];then + continue + else + break + fi + done + COUNTER=$(($COUNTER + 2)) done + + su -c "app_launcher -k $1 > /dev/null" $DEVICE_EXECUTION_MODE_30 + for i in {1..100} + do + sleep 0.1 + RE=`su -c "app_launcher -r $1 " $DEVICE_EXECUTION_MODE_30` + if [[ $RE == *"result: running"* ]];then + continue + else + break + fi + done + if [ -e $ERRLOG_PATH ]; then echo `cat $ERRLOG_PATH` @@ -114,6 +113,11 @@ function Execute { echo `cat $UTC_LOG_CORE` rm -f $UTC_LOG_CORE fi + if [[ $TIME_OUT == "1" ]]; + then + exit 1 + fi + exit `cat $RESULT_PATH` } diff --git a/scripts_tpk/tpk-install.py b/scripts_tpk/tpk-install.py index aa3e64b67..27a4b4cd0 100755 --- a/scripts_tpk/tpk-install.py +++ b/scripts_tpk/tpk-install.py @@ -155,7 +155,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): if ( re.search(process_dali_application, MODNAME) != None ): shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') elif ( re.search(process1, MODNAME) != None or re.search(process2, MODNAME) != None ): - shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_binary_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') + shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_multi_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') elif ( COVERAGE == '1' ): print('-- Using Coverage Wrapper...') shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_coverage.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py index 3f8c029be..09a599fea 100755 --- a/scripts_tpk/tpksdk-install.py +++ b/scripts_tpk/tpksdk-install.py @@ -145,7 +145,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE): if ( re.search(process_dali_application, MODNAME) != None ): shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') elif ( re.search(process1, MODNAME) != None or re.search(process2, MODNAME) != None ): - shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_binary_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') + shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_dali_multi_app_launch.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') elif ( COVERAGE == '1' ): print('-- Using Coverage Wrapper...') shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper_coverage.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'external_wrapper.sh') diff --git a/src/itc/dali-adaptor/tct-dali-adaptor-native.cpp b/src/itc/dali-adaptor/tct-dali-adaptor-native.cpp index 2ded376fb..043f29c0c 100755 --- a/src/itc/dali-adaptor/tct-dali-adaptor-native.cpp +++ b/src/itc/dali-adaptor/tct-dali-adaptor-native.cpp @@ -32,12 +32,6 @@ #include "tct-dali-adaptor-native_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} int gArgc; char ** gArgv; @@ -87,8 +81,8 @@ int main(int argc, const char *argv[]) if(!func_name) { - printf("Testcase name is empty.\n"); - return 2; + printf("Testcase name is empty.\n"); + return 2; } //setting gcda file location for coverage @@ -101,8 +95,8 @@ int main(int argc, const char *argv[]) if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) { if ( tc_array[i].startup ) { - dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); - tc_array[i].startup(); + dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); + tc_array[i].startup(); } dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); @@ -114,19 +108,15 @@ int main(int argc, const char *argv[]) tc_array[i].cleanup(); } - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; + free(func_name); + return result; } } dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - return 1; + + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/itc/dali-core/tct-dali-core-native.cpp b/src/itc/dali-core/tct-dali-core-native.cpp index 816521544..ded9f8c03 100755 --- a/src/itc/dali-core/tct-dali-core-native.cpp +++ b/src/itc/dali-core/tct-dali-core-native.cpp @@ -32,13 +32,6 @@ #include "tct-dali-core-native_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} - int gArgc; char ** gArgv; @@ -115,17 +108,15 @@ int main(int argc, const char *argv[]) tc_array[i].cleanup(); } - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; + free(func_name); + return result; } } - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - return 1; + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + + + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/itc/dali-toolkit/tct-dali-toolkit-native.cpp b/src/itc/dali-toolkit/tct-dali-toolkit-native.cpp index 51f3e645a..8072d7c06 100755 --- a/src/itc/dali-toolkit/tct-dali-toolkit-native.cpp +++ b/src/itc/dali-toolkit/tct-dali-toolkit-native.cpp @@ -32,13 +32,6 @@ #include "tct-dali-toolkit-native_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} - int gArgc; char ** gArgv; @@ -115,19 +108,15 @@ int main(int argc, const char *argv[]) tc_array[i].cleanup(); } - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; + free(func_name); + return result; } } - dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - return 1; + + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/utc/dali-adaptor/tct-dali-adaptor-core.cpp b/src/utc/dali-adaptor/tct-dali-adaptor-core.cpp index 3cb1ffb58..1271df867 100755 --- a/src/utc/dali-adaptor/tct-dali-adaptor-core.cpp +++ b/src/utc/dali-adaptor/tct-dali-adaptor-core.cpp @@ -15,7 +15,10 @@ // #include #include +#include #include +#include + #ifdef MOBILE #include "tct-dali-adaptor-core_mobile.h" #endif @@ -28,17 +31,8 @@ #ifdef COMMON_IOT //Starts COMMON_IOT #include "tct-dali-adaptor-core_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#include -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} -FILE *g_fpLog; -FILE *g_fpLogDump; int gArgc; char ** gArgv; int test_return_value; @@ -84,44 +78,45 @@ int main(int argc, const char *argv[]) func_name = strdup((char *)val); } - + + if(!func_name) + { + printf("Testcase name is empty.\n"); + return 2; + } + //setting gcda file location for coverage setenv("GCOV_PREFIX","/tmp",1); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, func_name); - for (i = 0; tc_array[i].name; i++) - { - if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) - { - DUMP_UTC_ERRLOG(); - if (tc_array[i].startup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); - tc_array[i].startup(); - } - - dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); - result = tc_array[i].function(); - - if (tc_array[i].cleanup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); - tc_array[i].cleanup(); - } - CLOSE_UTC_ERRLOG(); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; + for (i = 0; tc_array[i].name; i++) { + if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) { + if ( tc_array[i].startup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); + tc_array[i].startup(); + } + + dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); + result = tc_array[i].function(); + + if ( tc_array[i].cleanup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); + tc_array[i].cleanup(); + } + + free(func_name); + return result; } } - dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - return 1; + + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/utc/dali-core/tct-dali-core-core.cpp b/src/utc/dali-core/tct-dali-core-core.cpp index f148df779..4cbcdff2f 100755 --- a/src/utc/dali-core/tct-dali-core-core.cpp +++ b/src/utc/dali-core/tct-dali-core-core.cpp @@ -15,27 +15,23 @@ // #include #include +#include #include +#include + #ifdef MOBILE #include "tct-dali-core-core_mobile.h" -#endif +#endif /*MOBILE*/ #ifdef WEARABLE #include "tct-dali-core-core_wearable.h" -#endif +#endif /*WEARABLE*/ #ifdef TV #include "tct-dali-core-core_tv.h" -#endif +#endif /*TV*/ #ifdef COMMON_IOT //Starts COMMON_IOT #include "tct-dali-core-core_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#include -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} int gArgc; char ** gArgv; @@ -59,7 +55,7 @@ int main(int argc, const char *argv[]) gArgv = (char **)argv; if (argc < 2) { - dlog_print(DLOG_ERROR,"Usage: %s \n", argv[0]); + printf("Usage: %s \n", argv[0]); return 2; } else if (argc > 2) { @@ -82,52 +78,45 @@ int main(int argc, const char *argv[]) func_name = strdup((char *)val); } - + if(!func_name) { - dlog_print(DLOG_ERROR,"Testcase name %s is empty.\n", ""); - return 2; + printf("Testcase name is empty.\n"); + return 2; } - + //setting gcda file location for coverage setenv("GCOV_PREFIX","/tmp",1); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__); - + dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, func_name); for (i = 0; tc_array[i].name; i++) { if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) { if ( tc_array[i].startup ) - { - dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); - tc_array[i].startup(); - } - - dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); - result = tc_array[i].function(); - - if ( tc_array[i].cleanup ) - { - dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); - tc_array[i].cleanup(); - } - - if(smack_mode) { - free(func_name); - } - - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; - return result; + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); + tc_array[i].startup(); + } + + dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); + result = tc_array[i].function(); + + if ( tc_array[i].cleanup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); + tc_array[i].cleanup(); + } + + free(func_name); + return result; } } - dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - - return 1; + + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/utc/dali-toolkit/tct-dali-toolkit-core.cpp b/src/utc/dali-toolkit/tct-dali-toolkit-core.cpp index 685b05bb8..e07db8e5c 100755 --- a/src/utc/dali-toolkit/tct-dali-toolkit-core.cpp +++ b/src/utc/dali-toolkit/tct-dali-toolkit-core.cpp @@ -15,7 +15,10 @@ // #include #include +#include #include +#include + #ifdef MOBILE #include "tct-dali-toolkit-core_mobile.h" #endif @@ -28,100 +31,92 @@ #ifdef COMMON_IOT //Starts COMMON_IOT #include "tct-dali-toolkit-core_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#include -#define UTC_LOG "/tmp/utclog_core" -#define PRINT_UTC_LOG(...) {\ - FILE* g_fpLog = fopen(UTC_LOG, "a");\ - fprintf(g_fpLog, __VA_ARGS__);\ - fclose(g_fpLog);\ -} -FILE *g_fpLog; -FILE *g_fpLogDump; int gArgc; char ** gArgv; int test_return_value; int main(int argc, const char *argv[]) { - int result = -1; - int i; - int smack_mode = 0; - int byte_size; - char* encoded_byte; - unsigned char* byte=NULL; - - static const size_t sz_byte_len = sizeof(size_t); - static const size_t sz_type = sizeof(int); - static const size_t sz_keysize = sizeof(size_t); - static const size_t sz_size = sizeof(size_t); - - if (argc < 2) { - printf("Usage: %s \n", argv[0]); - return 2; - } - else if (argc > 2) { - smack_mode = 1; - } - - gArgc = argc; - gArgv = (char **)argv; - - char* func_name = (char*)argv[1]; - - if (smack_mode) { - encoded_byte=(char*)argv[3]; - - byte=g_base64_decode(encoded_byte,(gsize*)&byte_size); + int result = -1; + int i; + int smack_mode = 0; + int byte_size; + char* encoded_byte; + unsigned char* byte=NULL; + + static const size_t sz_byte_len = sizeof(size_t); + static const size_t sz_type = sizeof(int); + static const size_t sz_keysize = sizeof(size_t); + static const size_t sz_size = sizeof(size_t); + + gArgc = argc; + gArgv = (char **)argv; + + if (argc < 2) { + printf("Usage: %s \n", argv[0]); + return 2; + } + else if (argc > 2) { + smack_mode = 1; + } - size_t byte_len = *((size_t *)byte); byte += sz_byte_len; - int type = *((int *)byte); byte += sz_type; - size_t keysize = *((size_t *)byte); byte += sz_keysize; - char *key = (char *)byte; byte += keysize; - size_t size = *((size_t *)byte); byte += sz_size; - void *val = (void *)byte; byte += size; + char* func_name = (char*)argv[1]; - func_name = strdup((char *)val); - } + if (smack_mode) { + encoded_byte=(char*)argv[3]; - //setting gcda file location for coverage - setenv("GCOV_PREFIX","/tmp",1); - dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__); + byte=g_base64_decode(encoded_byte,(gsize*)&byte_size); - dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, func_name); + size_t byte_len = *((size_t *)byte); byte += sz_byte_len; + int type = *((int *)byte); byte += sz_type; + size_t keysize = *((size_t *)byte); byte += sz_keysize; + char *key = (char *)byte; byte += keysize; + size_t size = *((size_t *)byte); byte += sz_size; + void *val = (void *)byte; byte += size; - for (i = 0; tc_array[i].name; i++) - { - if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) + func_name = strdup((char *)val); + } + + if(!func_name) { - DUMP_UTC_ERRLOG(); - if (tc_array[i].startup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); - tc_array[i].startup(); - } - - dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); - result = tc_array[i].function(); - - if (tc_array[i].cleanup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); - tc_array[i].cleanup(); - } - CLOSE_UTC_ERRLOG(); - if(smack_mode) { - free(func_name); + printf("Testcase name is empty.\n"); + return 2; + } + + //setting gcda file location for coverage + setenv("GCOV_PREFIX","/tmp",1); + dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__); + + dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, func_name); + + for (i = 0; tc_array[i].name; i++) { + if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) { + if ( tc_array[i].startup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); + tc_array[i].startup(); + } + + dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); + result = tc_array[i].function(); + + if ( tc_array[i].cleanup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); + tc_array[i].cleanup(); + } + + free(func_name); + return result; } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; } - } + + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); - PRINT_UTC_LOG("\\n[%s][Line : %d]Unable to execute %s : Unknown Test Case Name\\n", __FILE__, __LINE__, func_name); - if(smack_mode) { - free(func_name); - } - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", 1); fclose(fres); - return 1; + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); + return 2; } diff --git a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core.cpp b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core.cpp index 6ea779d61..952e067cd 100755 --- a/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core.cpp +++ b/src/utc/widget_viewer_dali/tct-widget_viewer_dali-core.cpp @@ -15,7 +15,10 @@ // #include #include +#include #include +#include + #ifdef MOBILE #include "tct-widget_viewer_dali-core_mobile.h" #endif @@ -28,10 +31,9 @@ #ifdef COMMON_IOT //Starts COMMON_IOT #include "tct-widget_viewer_dali-core_common_iot.h" #endif //COMMON_IOT //End COMMON_IOT -#include -FILE *g_fpLog; -FILE *g_fpLogDump; + + int gArgc; char ** gArgv; int test_return_value; @@ -77,37 +79,45 @@ int main(int argc, const char *argv[]) func_name = strdup((char *)val); } - + + if(!func_name) + { + printf("Testcase name is empty.\n"); + return 2; + } + //setting gcda file location for coverage setenv("GCOV_PREFIX","/tmp",1); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__); dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, func_name); - for (i = 0; tc_array[i].name; i++) - { - if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) - { - DUMP_UTC_ERRLOG(); - if (tc_array[i].startup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); - tc_array[i].startup(); - } - - dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); - result = tc_array[i].function(); - - if (tc_array[i].cleanup){ - dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); - tc_array[i].cleanup(); - } - CLOSE_UTC_ERRLOG(); - FILE *fres = fopen("/tmp/tcresult","w"); fprintf(fres, "%d", result); fclose(fres); return result; + for (i = 0; tc_array[i].name; i++) { + if (!strncmp(func_name, tc_array[i].name, strlen(func_name))) { + if ( tc_array[i].startup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Start up", func_name); + tc_array[i].startup(); + } + + dlog_print(DLOG_INFO, "NativeTCT", "%s : Body", func_name); + result = tc_array[i].function(); + + if ( tc_array[i].cleanup ) + { + dlog_print(DLOG_INFO, "NativeTCT", "%s : Clean up", func_name); + tc_array[i].cleanup(); + } + + free(func_name); + return result; } } - dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + dlog_print(DLOG_ERROR, "NativeTCT", "[%s:%d] Unable to execute %s : Unknown Test Case Name", __FUNCTION__, __LINE__, func_name); + printf("Unknown testcase name: \"%s\"\n", func_name); + free(func_name); return 2; } -- 2.34.1