From 5a070f4f1318d7867ef67679e904e1df9d3770fd Mon Sep 17 00:00:00 2001
From: Bon-Yong Lee <bonyong.lee@samsung.com>
Date: Tue, 22 Oct 2013 11:29:50 +0900
Subject: [PATCH] [Title] Fix test case for sikuli [Desc.] [Issue]

Change-Id: I32b5a22105800985abfa62e9ee2092aa700364cc
---
 .../test/sikuli/ide-test-workspace.zip             | Bin 152106 -> 152066 bytes
 org.tizen.common/test/sikuli/test-ide.sh           |  30 +++++----------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 org.tizen.common/test/sikuli/ide-test-workspace.zip

diff --git a/org.tizen.common/test/sikuli/ide-test-workspace.zip b/org.tizen.common/test/sikuli/ide-test-workspace.zip
old mode 100644
new mode 100755
index 72a4f07efb150fc7e58c45a69ac281eec990d273..52c461f059922b9f65ba0e428959f7d8fb645b0e
GIT binary patch
delta 559
zcmZ3rgtKW0XTui8eSf#V_{aEGREn8Jgn@y9gFz-L%-Q%_Vbn4p?=29AF-*TG%cMR1
zf-{r&bcuhAV)dncd$|r7h`4>XbDh?}x7YRH(g|BbHtgccZJ%)GTEagMCs*(Lce&Qt
zelEA;<62we@_~_^Cxg{(hJnjd9qSamo(Wgjbve>|HZQnqk;L#Y();P3xW;9Snx3)c
zOATWsA79#TV*hjAg)Ddd>Pf;`EAH;OWU(;qd3NdTc@_sROO>Rkf3e#iQ{i@=RgYD|
zC+5=;ZdJqo-%Wa_oIZbM(x*HR{waUXvaM52i{E}(gvrWe`UG7juIZaSnWUy0dNPGh
z|8RnlWxARdlLu4dzv&;{nf#_PGO<mSW)hly&5Ox_Dd#^-P-=REH<JUi8w1nykG~iL
zr{7})s!{U+3UM+qO)unN3Y_d9%sPF)50e*jDKl7+@AQ997}=)B`!e}3uVG=DevpkR
zXqq3BA5#_U^Z-Amxy)W{Ow%W_GbK*X_GOZpe!zx_ZF;dklN_@aJJ`hJ>EHc<=8JPe
zO<T>y#5a9v08mJli)nh|1xDTJcE1=or}G6eIWza72z3QAg)yJx2HJUoQEd9pKqgsj
zMkWykTu};)S0G?yPymuEg_))^{$~u5E+|S(D-Q5xWdq3-0->fY1H)kvCLj+03W>eo

delta 518
zcmZo#!ntY*XTui8eSgJ87#J8h7_54~J4N1Q@1F(a-3H>YsfkSP(`EiK@^TjxrKS~!
zhHx@4UzpzejZwV5Z!gy&0};3HcCOPJ`1ZOUTsmQEh`}zd-1Z4E-Ujt53l}YYpT~NA
z-cM_J_N5mU6<a#^dtRuh%`i}VD{C!c*EiuSyR1k4+VX@y7D+6U5$;$2#4(<8)V#E<
zHa9nZ`4%2oUH?RdEjKToo;Rf>>Xq4g9>0tmKX2XHrXJU|hfP*;uhe;c`T3e0o!+cs
zn*)@(y|i`y+s@J6`sd6e?(Mt&GJX`@epH0X!esge8zweE41Y}*@nlMxe#?W&o$1NH
z=?~qR+(5pRoW9kSNp1QHPbMj*)&D`lev|L>vrU)qVhUoK#xR}H7b<YTiz$SufDtS(
zbpw;w^eS&A2PR`?hzkFyoYQNVn7F3P`Y<^#&Y$MX<UjpBGn3Ht{Xjm`HCB+Sg-lD>
zKy>i*@4if4OeO4Kt<&dgG4V`4z{bQeeW@Q%Z3qWM*wmjXjLDG;!ny6w<j3UB4dQ4|
zxBkV*Gd(GQ$(d<8vd9B2prgJ70FC&}15zkH-8Ya)R)m!e7^w_}K<H@8z;IcF3CIHg
D1<|qF

diff --git a/org.tizen.common/test/sikuli/test-ide.sh b/org.tizen.common/test/sikuli/test-ide.sh
index d05bc4f..a7d4faa 100755
--- a/org.tizen.common/test/sikuli/test-ide.sh
+++ b/org.tizen.common/test/sikuli/test-ide.sh
@@ -85,16 +85,11 @@ function kill_emulator ()
     local cnt=0
     while :
     do
-        if [[ "${OS}" == "win" ]] ; then
-            EM_VM_PID=`cmd //c tasklist | grep emulator-x86 | awk '{ print $2 }'`
-        else
-            EM_VM_PID=`ps aux | grep test | awk '{ print $2 "\t" $11 }' | grep emulator | awk '{ print $1 }'`
-        fi
+        EM_VM_PID=`ps aux | grep test | awk '{ print $2 "\t" $11 }' | grep emulator | awk '{ print $1 }'`
 
         if [[ -n "${EM_VM_PID}" ]] ; then
             notify "emulator pid : '${EM_VM_PID}'"
             kill -9 ${EM_VM_PID}
-            cmd //c taskkill //PID ${EM_VM_PID} //T //F
             printAndwait 10
         elif [[ ! -n "${EM_VM_PID}" && ${cnt} -eq 0 ]] ; then
             notify "emulator process kill success..."
@@ -126,16 +121,11 @@ function kill_ide ()
     local cnt=0
     while :
     do
-        if [[ "${OS}" == "win" ]] ; then
-            TIZEN_IDE_PID=`cmd //c tasklist | grep eclipse | awk '{ print $2 }'`
-        else
-            TIZEN_IDE_PID=`ps aux | grep test | awk '{ print $2 "\t" $11 }' | grep eclipse | awk '{ print $1 }'`
-        fi
+        TIZEN_IDE_PID=`ps aux | grep test | awk '{ print $2 "\t" $11 }' | grep eclipse | awk '{ print $1 }'`
 
         if [[ -n "${TIZEN_IDE_PID}" ]] ; then
             notify "tizen ide pid : '${TIZEN_IDE_PID}'"
             kill -9 ${TIZEN_IDE_PID}
-            cmd //c taskkill //PID ${TIZEN_IDE_PID} //T //F
             printAndwait 10
         elif [[ ! -n "${TIZEN_IDE_PID}" && ${cnt} -eq 0 ]] ; then
             notify "tizen ide process kill success..."
@@ -224,11 +214,7 @@ function init_variable ()
 
 
     #### sikuli cmd
-    if [[ "${OS}" == "win" ]] ; then
-        SIKULI_CMD="cmd //c /c/sikuli/runIDE.cmd"
-    else
-        SIKULI_CMD="$SIKULI_PATH/runIDE"
-    fi
+    SIKULI_CMD="/home/test/sikuli/runIDE"
     notify "sikuli\tcmd  : ${SIKULI_CMD}"
 
 
@@ -241,13 +227,9 @@ function init_variable ()
 
 
     #### emulator manager cmd
-    if [[ "${OS}" == "win" ]] ; then
-        EM_CMD="java -jar ${TIZEN_SDK}/tools/emulator/bin/emulator-manager.jar"
-    else
-        EM_CMD="${TIZEN_SDK}/tools/emulator/bin/emulator-manager"
-        if [ ! -f "${EM_CMD}" ] ; then
-            return $RESULT
-        fi
+    EM_CMD="${TIZEN_SDK}/tools/emulator/bin/emulator-manager"
+    if [ ! -f "${EM_CMD}" ] ; then
+        return $RESULT
     fi
     notify "emul\tcmd  : ${EM_CMD}"
 
-- 
2.7.4