[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

eric at webkit.org eric at webkit.org
Thu Feb 4 21:31:42 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit d0ee0848b91976b78bfd5e48d2b391de8137f13a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 01:32:49 2010 +0000

    2010-01-28  Hayato Ito  <hayato at chromium.org>
    
            Reviewed by David Levin.
    
            Remove NULL char from input JS file because 'grep' fails if the file contains NULL char.
    
            https://bugs.webkit.org/show_bug.cgi?id=34252
    
            * Scripts/make-script-test-wrappers:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54033 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eef3857..71aafe9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-28  Hayato Ito  <hayato at chromium.org>
+
+        Reviewed by David Levin.
+
+        Remove NULL char from input JS file because 'grep' fails if the file contains NULL char.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34252
+
+        * Scripts/make-script-test-wrappers:
+
 2010-01-28  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix after removal of the zlib image decoder.
diff --git a/WebKitTools/Scripts/make-script-test-wrappers b/WebKitTools/Scripts/make-script-test-wrappers
index 133476c..aed1834 100755
--- a/WebKitTools/Scripts/make-script-test-wrappers
+++ b/WebKitTools/Scripts/make-script-test-wrappers
@@ -99,7 +99,7 @@ for my $tfile (@templates) {
         $html =~ s:${templateDirectory}/(.*)\.js:$1.html:;
         next if -f "$html-disabled";
 
-        system("grep -q 'successfullyParsed =' $file");
+        system("cat ${file} | tr '\\0' ' ' | grep -q 'successfullyParsed ='");
         if ($? != 0) {
             `echo "" >> "${file}"`;
             `echo "var successfullyParsed = true;" >> "${file}"`;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list