Add handling logic for some exception case.

Kill all running emulator(s) before test begin.
Use pkill for more certain shutdown.

Change-Id: I87b8ed93ef3c53e9a02ccdd9d8c476f782d3b785
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/integration/conformance-test/supplement/conformance-test.sh b/integration/conformance-test/supplement/conformance-test.sh
index 32f1a0f..8380e10 100755 (executable)
--- a/integration/conformance-test/supplement/conformance-test.sh
+++ b/integration/conformance-test/supplement/conformance-test.sh
@@ -6,10 +6,10 @@ UNAME=`uname`
 pushd . > /dev/null
 
 SCRIPT_PATH="${BASH_SOURCE[0]}";
-    while([ -h "${SCRIPT_PATH}" ]) do
-        cd "`dirname "${SCRIPT_PATH}"`"
-        SCRIPT_PATH="$(readlink "`basename "${SCRIPT_PATH}"`")";
-    done
+       while([ -h "${SCRIPT_PATH}" ]) do
+               cd "`dirname "${SCRIPT_PATH}"`"
+               SCRIPT_PATH="$(readlink "`basename "${SCRIPT_PATH}"`")";
+       done
 cd "`dirname "${SCRIPT_PATH}"`" > /dev/null
 SCRIPT_PATH="`pwd`";
 
@@ -17,7 +17,7 @@ popd > /dev/null
 
 ### TIZEN_SDK is tizen-sdk path ###
 if [ `ls ${SCRIPT_PATH}/../../sdk.info | grep sdk.info | wc -l` -eq 1 ] ; then
-    TIZEN_SDK=`cat ${SCRIPT_PATH}/../../sdk.info | grep TIZEN_SDK_INSTALLED_PATH= | sed -e s/TIZEN_SDK_INSTALLED_PATH=/""/g`
+       TIZEN_SDK=`cat ${SCRIPT_PATH}/../../sdk.info | grep TIZEN_SDK_INSTALLED_PATH= | sed -e s/TIZEN_SDK_INSTALLED_PATH=/""/g`
 fi
 
 if [ -z "$TIZEN_SDK" ]; then
@@ -26,7 +26,7 @@ fi
 
 ### TIZEN_SDK_DATA is tizen-sdk-data path ###
 if [ `ls ${SCRIPT_PATH}/../../sdk.info | grep sdk.info | wc -l` -eq 1 ] ; then
-    TIZEN_SDK_DATA=`cat ${SCRIPT_PATH}/../../sdk.info | grep TIZEN_SDK_DATA_PATH= | sed -e s/TIZEN_SDK_DATA_PATH=/""/g`
+       TIZEN_SDK_DATA=`cat ${SCRIPT_PATH}/../../sdk.info | grep TIZEN_SDK_DATA_PATH= | sed -e s/TIZEN_SDK_DATA_PATH=/""/g`
 fi
 
 if [ -z "$TIZEN_SDK_DATA" ]; then
@@ -111,18 +111,16 @@ function check_sdb_connection() {
 ### terminate test process ###
 function kill_emulator {
        output ""
-       output "Kill Emulator"
-       if [ "${EM_PID}" != "" ] ;
-       then
-               ${KILL} ${EM_PID}
-       else
-               ${PKILL} emulator-x86*
-       fi
+       output "Terminate Emulator"
 
-       # for windows
-       sleep 20
+       ${PKILL} emulator-x86*
 
-       ${EMULATOR_MANAGER} delete -n ${EMULATOR_NAME} | tee -a ${RESULT_FILE}
+#      if [ "${EM_PID}" != "" ] ;
+#      then
+#              ${KILL} ${EM_PID}
+#      else
+#              ${PKILL} emulator-x86*
+#      fi
 }
 
 function shutdown_emulator {
@@ -135,13 +133,26 @@ function shutdown_emulator {
        # for windows
        sleep 20
 
+       output "- Delete vm"
        ${EMULATOR_MANAGER} delete -n ${EMULATOR_NAME} | tee -a ${RESULT_FILE}
        if [[ $? != 0 ]]
        then
                kill_emulator
+
+               sleep 20
+
+               output "- Delete vm again"
+               ${EMULATOR_MANAGER} delete -n ${EMULATOR_NAME} | tee -a ${RESULT_FILE}
        fi
 }
 
+#### Shutdown all running emulator(s) ####
+output "Kill all emulator(s)"
+
+kill_emulator
+
+sleep 5
+
 ### Start Conformance Test ###
 output "Start Conformance Test"
 output ""
@@ -159,7 +170,7 @@ mkdir -p ${CUSTOM_PATH}
 
 ##### # is Test Case Name #####
 ##### $ is Success Token #####
-##### @ is Test Command #####
+#### @ is Test Command #####
 
 COMMAND=""