Changeset 76704 in webkit

Timestamp:

Jan 26, 2011 11:53:52 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-26 Xianzhu Wang <​wangxianzhu@google.com>

Reviewed by Tony Chang.

Add '--no-timeout' option to Chromium DRT to ease debugging.
​https://bugs.webkit.org/show_bug.cgi?id=52873

• DumpRenderTree/chromium/DumpRenderTree.cpp: (main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/DumpRenderTree.cpp (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-26  Xianzhu Wang  <wangxianzhu@google.com>
+
+        Reviewed by Tony Chang.
+
+        Add '--no-timeout' option to Chromium DRT to ease debugging.
+        https://bugs.webkit.org/show_bug.cgi?id=52873
+
+        * DumpRenderTree/chromium/DumpRenderTree.cpp:
+        (main):
+
 2011-01-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp

@@ -59 +59 @@
 static const char optionStressDeopt[] = "--stress-deopt";
 static const char optionJavaScriptFlags[] = "--js-flags=";
+static const char optionNoTimeout[] = "--no-timeout=";
 
 static void runTest(TestShell& shell, TestParams& params, const string& testName, bool testShellMode)
@@ -124 +125 @@
     bool hardwareAcceleratedGL = false;
     string javaScriptFlags;
+    bool noTimeout = false;
     for (int i = 1; i < argc; ++i) {
         string argument(argv[i]);
@@ -156 +158 @@
         else if (!argument.find(optionJavaScriptFlags))
             javaScriptFlags = argument.substr(strlen(optionJavaScriptFlags));
+        else if (!argument.find(optionNoTimeout))
+            noTimeout = true;
         else if (argument.size() && argument[0] == '-')
             fprintf(stderr, "Unknown option: %s\n", argv[i]);
@@ -183 +187 @@
         shell.setStressOpt(stressOpt);
         shell.setStressDeopt(stressDeopt);
+        if (noTimeout) {
+            // 0x20000000ms is big enough for the purpose to avoid timeout in debugging.
+            shell.setLayoutTestTimeout(0x20000000);
+        }
         if (serverMode && !tests.size()) {
             params.printSeparators = true;