Fix autotest to work on latest images

Change-Id: Ib72d3d8b725cbfafbb7b47a0228a95e25cfe8d9b

diff --git a/ism/demos/autotest/autotest.sh b/ism/demos/autotest/autotest.sh
index 1594ff5..e797e2d 100755 (executable)
--- a/ism/demos/autotest/autotest.sh
+++ b/ism/demos/autotest/autotest.sh
@@ -9,6 +9,11 @@ export AUTOTEST_PATH=${1:-$(pwd)}
 export AUTOTEST_SDB_MODE=${2:-'-d'}
 export AUTOTEST_PROFILE=${3:-'mobile'}
 
+case $AUTOTEST_PATH in
+    /*) AUTOTEST_PATH=$AUTOTEST_PATH;;
+     *) AUTOTEST_PATH=$PWD/$AUTOTEST_PATH;;
+esac
+
 export PROCESS_CMDS_SCRIPT="$AUTOTEST_PATH/process_cmds.sh"
 export WORKSPACE_LINK_NAME="workspace"
 
@@ -28,7 +33,10 @@ function prepare() {
     ln -s $AUTOTEST_CURRENT_RESULT_DIR $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME
 
     sdb $AUTOTEST_SDB_MODE root on
-    sdb $AUTOTEST_SDB_MODE shell "echo 'isf-demo-efl /autotest 2>/dev/null' > $AUTOTEST_TARGET_PATH"
+    sdb $AUTOTEST_SDB_MODE shell "echo 'export USER=root' > $AUTOTEST_TARGET_PATH"
+    sdb $AUTOTEST_SDB_MODE shell "echo 'for i in /etc/profile.d/* ;do source \$i;done' >> $AUTOTEST_TARGET_PATH"
+    sdb $AUTOTEST_SDB_MODE shell "echo 'isf-demo-efl /autotest 2>/dev/null' >> $AUTOTEST_TARGET_PATH"
+    sdb $AUTOTEST_SDB_MODE shell "chmod a+x $AUTOTEST_TARGET_PATH"
 }
 
 function cleanup() {
@@ -50,6 +58,6 @@ do
         echo "[CMD] : $CMD_LINE"
         $PROCESS_CMDS_SCRIPT $CMD_LINE
     fi
-done < <(sdb $AUTOTEST_SDB_MODE shell "su - owner $AUTOTEST_TARGET_PATH" 2>&1)
+done < <(sdb $AUTOTEST_SDB_MODE shell "$AUTOTEST_TARGET_PATH" 2>&1)
 
 cleanup

diff --git a/ism/demos/autotest/cmd_dump_ime_surface.sh b/ism/demos/autotest/cmd_dump_ime_surface.sh
index be19ce3..36ab6a7 100755 (executable)
--- a/ism/demos/autotest/cmd_dump_ime_surface.sh
+++ b/ism/demos/autotest/cmd_dump_ime_surface.sh
@@ -7,8 +7,11 @@ NAME=$1
 
 ISE_PID=`sdb $AUTOTEST_SDB_MODE shell ps -ef | grep ise | awk '{print $2}'`
 ISE_XID=`sdb $AUTOTEST_SDB_MODE shell 'enlightenment_info -topvwins' | grep $ISE_PID | grep $ISE_WIN_NAME | awk '{print $2}' | tr -d '\r'`
-sdb $AUTOTEST_SDB_MODE shell 'rm -rf topvwins*'
-sdb $AUTOTEST_SDB_MODE shell 'enlightenment_info -dump_topvwins > /dev/null' > /dev/null
-DUMP_DIR=`sdb $AUTOTEST_SDB_MODE shell 'find / -maxdepth 1 -type d -name "topvwins*"' | tr -d '\r'`
-sdb $AUTOTEST_SDB_MODE pull $DUMP_DIR/$ISE_XID.png $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME/$NAME.dumpwin.png > /dev/null
-sdb $AUTOTEST_SDB_MODE shell 'rm -rf topvwins*'
+sdb $AUTOTEST_SDB_MODE shell 'rm -rf /tmp/topvwins*'
+sdb $AUTOTEST_SDB_MODE shell 'cd /tmp;enlightenment_info -dump topvwins > /dev/null' > /dev/null
+DUMP_DIR=`sdb $AUTOTEST_SDB_MODE shell 'find /tmp/ -maxdepth 1 -type d -name "topvwins*"' | tr -d '\r'`
+sdb $AUTOTEST_SDB_MODE pull $DUMP_DIR/"$ISE_XID"_0.png $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME/$NAME.png > /dev/null
+sdb $AUTOTEST_SDB_MODE pull $DUMP_DIR/"$ISE_XID"_90.png $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME/$NAME.png > /dev/null
+sdb $AUTOTEST_SDB_MODE pull $DUMP_DIR/"$ISE_XID"_180.png $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME/$NAME.png > /dev/null
+sdb $AUTOTEST_SDB_MODE pull $DUMP_DIR/"$ISE_XID"_270.png $AUTOTEST_CURRENT_RESULT_DIR/$WORKSPACE_LINK_NAME/$NAME.png > /dev/null
+sdb $AUTOTEST_SDB_MODE shell 'rm -rf /tmp/topvwins*'

diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp
index d32f259..4c4f426 100644 (file)
--- a/ism/demos/isf_demo_efl.cpp
+++ b/ism/demos/isf_demo_efl.cpp
@@ -453,14 +453,14 @@ EXAPI int main (int argc, char *argv[])
 
     elm_init (argc, argv);
 
-    app_create (&ad);
-
     for (int loop = 0;loop < argc;loop++) {
         if (strcmp(argv[loop], AUTOTEST_RUN_PARAMETER) == 0) {
             _autotest_enabled = true;
         }
     }
 
+    app_create (&ad);
+
     elm_run ();
 
     app_exit ((void *)&ad);