[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3e8e00d6686e0e6c011a4900d388f77ed99ec077
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 22:02:58 2010 +0000

    Don't hang when running run-webkit-tests as a non-Administrator on Vista/7
    
    * Scripts/old-run-webkit-tests:
    (setUpWindowsCrashLogSaving): Use regtool to set NTSD as the
    post-mortem debugger, rather than using NTSD itself. The latter waits
    for user input when it fails to set the registry values; the former
    does not.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65557 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dd744db..ec822c9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2010-08-17  Adam Roben  <aroben at apple.com>
 
+        Don't hang when running run-webkit-tests as a non-Administrator on
+        Vista/7
+
+        * Scripts/old-run-webkit-tests:
+        (setUpWindowsCrashLogSaving): Use regtool to set NTSD as the
+        post-mortem debugger, rather than using NTSD itself. The latter waits
+        for user input when it fails to set the registry values; the former
+        does not.
+
+2010-08-17  Adam Roben  <aroben at apple.com>
+
         Teach run-webkit-tests, DumpRenderTree, and WebKitTestRunner how to
         save crash logs on Windows
 
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 4701388..ef3dc19 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -2389,14 +2389,17 @@ sub setUpWindowsCrashLogSaving()
         }
     }
 
-    foreach my $value qw(Debugger Auto) {
+    my %values = (
+        Debugger => '"$ntsdPath" -p %ld -e %ld -g -lines -c ".logopen /t \"' . toWindowsPath($testResultsDirectory) . '\CrashLog.txt\";!analyze -vv;~*kpn;q"',
+        Auto => 1
+    );
+
+    foreach my $value (keys %values) {
         chomp($previousWindowsPostMortemDebuggerValues{$value} = `regtool get "$windowsPostMortemDebuggerKey/$value"`);
-    }
+        my $result = system "regtool", "set", "$windowsPostMortemDebuggerKey/$value", $values{$value};
+        next unless $result;
 
-    my $result = system $ntsdPath, "-iaec", '-lines -c ".logopen /t \"' . toWindowsPath($testResultsDirectory) . '\CrashLog.txt\";!analyze -vv;~*kpn;q"';
-    if ($result) {
-        print "Failed to set nstd.exe as the post-mortem debugger. Crash logs will not be saved.\nSee <http://trac.webkit.org/wiki/BuildingOnWindows#GettingCrashLogs>.\n";
-        %previousWindowsPostMortemDebuggerValues = ();
+        print "Failed to set \"$windowsPostMortemDebuggerKey/$value\". Crash logs will not be saved.\nSee <http://trac.webkit.org/wiki/BuildingOnWindows#GettingCrashLogs>.\n";
         return;
     }
 

-- 
WebKit Debian packaging