BugFix: Package test script.submit/tizen/20131219.041510submit/tizen/20131217.094411accepted/tizen/ivi/20131219.041140accepted/tizen/ivi/20131217.231627

Change-Id: If1cbd0bfc23ce0c104d6bbdb8141a20723c1e620
Signed-off-by: Hayato Nakamura <hayato.nakamura@mail.toyota-td.jp>

5 files changed, 20 insertions, 11 deletions

diff --git a/gtforce/ico_dic-gtforce.c b/gtforce/ico_dic-gtforce.c
index 61939cf..3af1256 100644
--- a/gtforce/ico_dic-gtforce.c
+++ b/gtforce/ico_dic-gtforce.c
@@ -575,7 +575,7 @@ ico_dic_js_read(int fd)
             }
             continue;
         }
-        ICO_DBG("ico_dic_js_read: Read(type=%d, number=%d, value=%d)",
+        ICO_PRF("SWITCH_EVENT Read(type=%d, number=%d, value=%d)",
                 type, number, value);
 
         if (mEventLog)  {
@@ -658,7 +658,7 @@ ico_dic_js_read(int fd)
             if (iMng->code[icode].keycode < 0)  {
                 /* start program if pressed */
                 if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
-                    ICO_DBG("ico_dic_js_read: start script(%s)", iMng->code[icode].appid);
+                    ICO_PRF("SWITCH_EVENT start script(%s)", iMng->code[icode].appid);
                     if (system(iMng->code[icode].appid) == -1)  {
                         ICO_DBG("ico_dic_js_read: script(%s) ret -1",
                                 iMng->code[icode].appid);
@@ -670,7 +670,7 @@ ico_dic_js_read(int fd)
                 if (state == WL_KEYBOARD_KEY_STATE_PRESSED) state = 1;
                 else                                        state = 0;
 
-                ICO_DBG("ico_dic_js_read: send event to %s(%d.%d)",
+                ICO_PRF("SWITCH_EVENT send event to %s(%d.%d)",
                         iMng->code[icode].appid, iMng->code[icode].keycode, state);
                 ico_input_mgr_control_send_input_event(gIco_Dic_Mng.Wayland_InputCtl,
                                                        iMng->code[icode].appid, 0,
@@ -680,7 +680,7 @@ ico_dic_js_read(int fd)
         }
         else    {
             /* general switch event, send to multi input manager    */
-            ICO_DBG("ico_dic_js_read: send general input event(%s.%d.%d.%d)",
+            ICO_PRF("SWITCH_EVENT send general input event(%s.%d.%d.%d)",
                     gIco_Dic_JS.device, iMng->input, code, state);
             ico_input_mgr_device_input_event(gIco_Dic_Mng.Wayland_InputMgr, events[ii].time,
                                              gIco_Dic_JS.device, iMng->input, code, state);
diff --git a/packaging/ico-uxf-device-input-controller.changes b/packaging/ico-uxf-device-input-controller.changes
index bf1728d..79a74fc 100644
--- a/packaging/ico-uxf-device-input-controller.changes
+++ b/packaging/ico-uxf-device-input-controller.changes
@@ -1,3 +1,8 @@
+* Fri Nov 29 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen_ivi_stable/20131119.040206@f02120b
+- 0.9.04 release
+-- bug fix: A package test script(tests/input-controller-test) becomes the error by a timing
+-- revise: Revise a package test to Wayland 1.3.0 and Weston 1.3.1 
+
 * Fri Nov 08 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/20131004.165240@340a57b
 - 0.9.03 release
 -- addition: Home/Back and Menu buttons addition of the steering switch.
diff --git a/packaging/ico-uxf-device-input-controller.spec b/packaging/ico-uxf-device-input-controller.spec
index c0f19d8..067ff83 100644
--- a/packaging/ico-uxf-device-input-controller.spec
+++ b/packaging/ico-uxf-device-input-controller.spec
@@ -1,6 +1,6 @@
 Name:       ico-uxf-device-input-controller
 Summary:    Device Input Controller
-Version:    0.9.03
+Version:    0.9.04
 Release:    1.1
 Group:      System/GUI
 License:    Apache License, Version 2.0
diff --git a/tests/input-controller-test b/tests/input-controller-test
index c9bfeb0..ed74a64 100755
--- a/tests/input-controller-test
+++ b/tests/input-controller-test
@@ -17,13 +17,15 @@ export DIC_GTFORCE_CONF="./testdata/g27racingwheel.conf"
 sleep 0.5
 
 # 4 Start Weston
-/usr/bin/weston --idle-time=0 $WESTON_BACKEND --log=../tests/testlog/weston.log &
+/usr/bin/weston --tty=1 --idle-time=0 $WESTON_BACKEND --log=../tests/testlog/weston.log &
 sleep 180
 
 # 5 End of Test
 sleep 1
 /usr/bin/killall ico_dic-gtforce
-sleep 0.2
+sleep 0.4
+/usr/bin/killall -9 ico_dic-gtforce > /dev/nul 2>&1
+sleep 0.1
 /usr/bin/killall weston
 sleep 1
 
@@ -45,7 +47,7 @@ fi
 if [ "$?" != "1" ] ; then
 	FOUND_ERR=1
 fi
-/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight"
+/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight" | /bin/grep -v "disconnect"
 if [ "$?" != "1" ] ; then
 	FOUND_ERR=1
 fi
diff --git a/tests/input-controller-test.G25 b/tests/input-controller-test.G25
index 4bd2ed7..88b2920 100755
--- a/tests/input-controller-test.G25
+++ b/tests/input-controller-test.G25
@@ -17,13 +17,15 @@ export DIC_GTFORCE_CONF="./testdata/drivingforcegt.conf"
 sleep 0.5
 
 # 4 Start Weston
-/usr/bin/weston --idle-time=0 $WESTON_BACKEND --log=../tests/testlog/weston.log &
+/usr/bin/weston --tty=1 --idle-time=0 $WESTON_BACKEND --log=../tests/testlog/weston.log &
 sleep 180
 
 # 5 End of Test
 sleep 1
 /usr/bin/killall ico_dic-gtforce
-sleep 0.2
+sleep 0.4
+/usr/bin/killall -9 ico_dic-gtforce > /dev/nul 2>&1
+sleep 0.1
 /usr/bin/killall weston
 sleep 1
 
@@ -45,7 +47,7 @@ fi
 if [ "$?" != "1" ] ; then
 	FOUND_ERR=1
 fi
-/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight"
+/bin/grep "Fail" testlog/* | /bin/grep -v "error_but_no_problem_for_test" | /bin/grep -v "initialize backlight" | /bin/grep -v "disconnect"
 if [ "$?" != "1" ] ; then
 	FOUND_ERR=1
 fi