projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set focus to web engine.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-event-thread-callback.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
index
0f037d3
..
02f3d8f
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp
@@
-77,7
+77,7
@@
bool EventThreadCallback::WaitingForTrigger()
struct timespec now;
clock_gettime( CLOCK_REALTIME, &now );
if( now.tv_nsec < 999900000 ) // 999, 900, 000
struct timespec now;
clock_gettime( CLOCK_REALTIME, &now );
if( now.tv_nsec < 999900000 ) // 999, 900, 000
- now.tv_nsec += 1000
00
;
+ now.tv_nsec += 1000;
else
{
now.tv_sec += 1;
else
{
now.tv_sec += 1;
@@
-99,10
+99,8
@@
CallbackBase* EventThreadCallback::GetCallback()
namespace Test
{
namespace Test
{
-bool WaitForEventThreadTrigger( int triggerCount )
+bool WaitForEventThreadTrigger( int triggerCount
, int timeoutInSeconds
)
{
{
- const int TEST_TIMEOUT(30);
-
struct timespec startTime;
struct timespec now;
clock_gettime( CLOCK_REALTIME, &startTime );
struct timespec startTime;
struct timespec now;
clock_gettime( CLOCK_REALTIME, &startTime );
@@
-126,10
+124,14
@@
bool WaitForEventThreadTrigger( int triggerCount )
Dali::CallbackBase::Execute( *callback );
triggerCount--;
}
Dali::CallbackBase::Execute( *callback );
triggerCount--;
}
+ if( triggerCount <= 0 )
+ {
+ break;
+ }
}
}
clock_gettime( CLOCK_REALTIME, &now );
}
}
clock_gettime( CLOCK_REALTIME, &now );
- if( now.tv_sec - startTime.tv_sec >
TEST_TIMEOUT
)
+ if( now.tv_sec - startTime.tv_sec >
timeoutInSeconds
)
{
// Ensure we break out of the loop if elapsed time has passed
break;
{
// Ensure we break out of the loop if elapsed time has passed
break;