Merge "[TCT][scripts_tpk][NonACR][DPTTIZEN-2674: Modified tpk build script and added...

diff --cc scripts_tpk/tpk-install.py
index a4942eb927a0fd215be2df9f1b4263f9bf38b35c,8f5a57ca45f489cb84e9d5288e12e0a39eddc308..9c70f6e50597871ffe878778a30df784c164a075
--- 1/scripts_tpk/tpk-install.py
--- 2/scripts_tpk/tpk-install.py
+++ b/scripts_tpk/tpk-install.py
@@@ -144,16 -148,19 +148,20 @@@ def install(TYPE, MODNAME, PROFILE, TC_
                                sys.exit('Aborting...')
                        
                        # external_wrapper.sh
+               
                        process_dali_application = "dali-application"
 -                      process = "dali"
 +                      process1 = "dali-"
 +                      process2 = "_dali"
                        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(process, MODNAME) != None ):
 +                      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')
+                       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')
                        else:
                                shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR)
- 
+                       
                        # LICENSE, add_all_smack_rule.sh, all_smack.rule
                        shutil.copy('scripts_tpk'+dirSeparator+'LICENSE', dirSeparator+'tmp'+dirSeparator+TCT_DIR)
  

diff --cc scripts_tpk/tpksdk-install.py
index 299dbd68f086c54da44172cf72139ae1566f4d2f,24f2427bfc2baa9a394620ae09ee8ab786ace5be..de3adcee8d94ee5cc4c157a37e6a3268229a8d48
--- 1/scripts_tpk/tpksdk-install.py
--- 2/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@@ -140,12 -140,14 +140,15 @@@ def install(TYPE, MODNAME, PROFILE, TC_
                        
                        # external_wrapper.sh
                        process_dali_application = "dali-application"
 -                      process = "dali"
 +                      process1 = "dali-"
 +                      process2 = "_dali"
                        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(process, MODNAME) != None ):
 +                      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')
+                       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')
                        else:
                                shutil.copy('scripts_tpk'+dirSeparator+'external_wrapper.sh', dirSeparator+'tmp'+dirSeparator+TCT_DIR)