Title: [149659] trunk/Tools
- Revision
- 149659
- Author
- [email protected]
- Date
- 2013-05-06 21:05:10 -0700 (Mon, 06 May 2013)
Log Message
[EFL][WK1][PerformanceTests] Adopt --no-timeout option implementation to DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=115645
Reviewed by Gyuyoung Kim.
To run performance tests in wk1, we need --no-timeout option implementation.
So adopt it from gtk+ port.
* DumpRenderTree/efl/DumpRenderTree.cpp:
(shouldSetWaitToDumpWatchdog):
(parseCommandLineOptions):
* DumpRenderTree/efl/DumpRenderTreeEfl.h:
* DumpRenderTree/efl/TestRunnerEfl.cpp:
(TestRunner::setWaitToDump):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149658 => 149659)
--- trunk/Tools/ChangeLog 2013-05-07 03:13:12 UTC (rev 149658)
+++ trunk/Tools/ChangeLog 2013-05-07 04:05:10 UTC (rev 149659)
@@ -1,3 +1,20 @@
+2013-05-06 Kangil Han <[email protected]>
+
+ [EFL][WK1][PerformanceTests] Adopt --no-timeout option implementation to DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=115645
+
+ Reviewed by Gyuyoung Kim.
+
+ To run performance tests in wk1, we need --no-timeout option implementation.
+ So adopt it from gtk+ port.
+
+ * DumpRenderTree/efl/DumpRenderTree.cpp:
+ (shouldSetWaitToDumpWatchdog):
+ (parseCommandLineOptions):
+ * DumpRenderTree/efl/DumpRenderTreeEfl.h:
+ * DumpRenderTree/efl/TestRunnerEfl.cpp:
+ (TestRunner::setWaitToDump):
+
2013-05-06 Commit Queue <[email protected]>
Unreviewed, rolling out r149547.
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp (149658 => 149659)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2013-05-07 03:13:12 UTC (rev 149658)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2013-05-07 04:05:10 UTC (rev 149659)
@@ -69,6 +69,7 @@
static int dumpPixelsForAllTests = false;
static int dumpTree = true;
static int printSeparators = true;
+static int useTimeoutWatchdog = true;
static String dumpFramesAsText(Evas_Object* frame)
{
@@ -167,6 +168,11 @@
fflush(stderr);
}
+bool shouldSetWaitToDumpWatchdog()
+{
+ return !waitToDumpWatchdog && useTimeoutWatchdog;
+}
+
static void invalidateAnyPreviousWaitToDumpWatchdog()
{
if (waitToDumpWatchdog) {
@@ -201,6 +207,7 @@
{"notree", no_argument, &dumpTree, false},
{"pixel-tests", no_argument, &dumpPixelsForAllTests, true},
{"tree", no_argument, &dumpTree, true},
+ {"no-timeout", no_argument, &useTimeoutWatchdog, false},
{0, 0, 0, 0}
};
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeEfl.h (149658 => 149659)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeEfl.h 2013-05-07 03:13:12 UTC (rev 149658)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeEfl.h 2013-05-07 04:05:10 UTC (rev 149659)
@@ -40,4 +40,6 @@
extern bool policyDelegatePermissive;
extern Ecore_Timer* waitToDumpWatchdog;
+bool shouldSetWaitToDumpWatchdog();
+
#endif /* DumpRenderTreeEfl_h */
Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (149658 => 149659)
--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2013-05-07 03:13:12 UTC (rev 149658)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2013-05-07 04:05:10 UTC (rev 149659)
@@ -288,7 +288,7 @@
static const double timeoutSeconds = 30;
m_waitToDump = waitUntilDone;
- if (m_waitToDump && !waitToDumpWatchdog)
+ if (m_waitToDump && shouldSetWaitToDumpWatchdog())
waitToDumpWatchdog = ecore_timer_add(timeoutSeconds, waitToDumpWatchdogFired, 0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
