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

aroben at apple.com aroben at apple.com
Wed Dec 22 12:17:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e432cbb9eaa16a3aa7bc08826e0c1ffd766482af
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 11:42:45 2010 +0000

    Fix hang when saving crash logs on Windows
    
    * Scripts/old-run-webkit-tests:
    (setUpWindowsCrashLogSaving):
    (END):
    Pass -s to regtool so it will write the Auto value as a string instead
    of as a number. This was causing a "do you want to debug?" dialog to
    appear.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6690528..324c32d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-18  Adam Roben  <aroben at apple.com>
+
+        Fix hang when saving crash logs on Windows
+
+        * Scripts/old-run-webkit-tests:
+        (setUpWindowsCrashLogSaving):
+        (END):
+        Pass -s to regtool so it will write the Auto value as a string instead
+        of as a number. This was causing a "do you want to debug?" dialog to
+        appear.
+
 2010-08-17  Victor Wang  <victorw at chromium.org>
 
         Unreviewed. Fixed chromium incremental test json upload.
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 3c83054..68aa6ed 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -2396,7 +2396,7 @@ sub setUpWindowsCrashLogSaving()
 
     foreach my $value (keys %values) {
         chomp($previousWindowsPostMortemDebuggerValues{$value} = `regtool get "$windowsPostMortemDebuggerKey/$value"`);
-        my $result = system "regtool", "set", "$windowsPostMortemDebuggerKey/$value", $values{$value};
+        my $result = system "regtool", "set", "-s", "$windowsPostMortemDebuggerKey/$value", $values{$value};
         next unless $result;
 
         print "Failed to set \"$windowsPostMortemDebuggerKey/$value\". Crash logs will not be saved.\nSee <http://trac.webkit.org/wiki/BuildingOnWindows#GettingCrashLogs>.\n";
@@ -2410,7 +2410,7 @@ END {
     return unless isCygwin();
 
     foreach my $value (keys %previousWindowsPostMortemDebuggerValues) {
-        my $result = system "regtool", "set", "$windowsPostMortemDebuggerKey/$value", $previousWindowsPostMortemDebuggerValues{$value};
+        my $result = system "regtool", "set", "-s", "$windowsPostMortemDebuggerKey/$value", $previousWindowsPostMortemDebuggerValues{$value};
         !$result or print "Failed to restore \"$windowsPostMortemDebuggerKey/$value\" to its previous value \"$previousWindowsPostMortemDebuggerValues{$value}\"\n.";
     }
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list