[Title] Fix test case for sikuli

[Desc.]
[Issue]

Change-Id: I32b5a22105800985abfa62e9ee2092aa700364cc

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 (file)
new mode 100755 (executable)
index 72a4f07..52c461f
Binary files a/org.tizen.common/test/sikuli/ide-test-workspace.zip and b/org.tizen.common/test/sikuli/ide-test-workspace.zip differ

diff --git a/org.tizen.common/test/sikuli/test-ide.sh b/org.tizen.common/test/sikuli/test-ide.sh
index d05bc4f..a7d4faa 100755 (executable)
--- 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}"