[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit b6db8178e7d501fd86c4866aad3c3e48a2d64370
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 19:53:52 2011 +0000

    2011-01-26  Xianzhu Wang  <wangxianzhu at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a8b46d7..58659e6 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-26  Xianzhu Wang  <wangxianzhu at 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 at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp b/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
index bd5075c..7e9010f 100644
--- a/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
@@ -58,6 +58,7 @@ static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-c
 static const char optionStressOpt[] = "--stress-opt";
 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)
 {
@@ -123,6 +124,7 @@ int main(int argc, char* argv[])
     bool stressDeopt = false;
     bool hardwareAcceleratedGL = false;
     string javaScriptFlags;
+    bool noTimeout = false;
     for (int i = 1; i < argc; ++i) {
         string argument(argv[i]);
         if (argument == "-")
@@ -155,6 +157,8 @@ int main(int argc, char* argv[])
             stressDeopt = true;
         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]);
         else
@@ -182,6 +186,10 @@ int main(int argc, char* argv[])
         shell.setJavaScriptFlags(javaScriptFlags);
         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;
             char testString[2048]; // 2048 is the same as the sizes of other platforms.

-- 
WebKit Debian packaging