[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[zoltan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8af7a1f3a40ba6c87bc9f8305c6c776495f12513
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 21 15:55:52 2009 +0000

    2009-09-21  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
    
            Reviewed by Maciej Stachowiak.
    
            [Qt] Make sunspider script work on Windows platform.
            https://bugs.webkit.org/show_bug.cgi?id=29544
    
            * sunspider:
            Using platform specific null device instead of /dev/null.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 4a5317c..e121eeb 100644
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-21  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
+
+        Reviewed by Maciej Stachowiak.
+
+        [Qt] Make sunspider script work on Windows platform.
+        https://bugs.webkit.org/show_bug.cgi?id=29544
+
+        * sunspider:
+        Using platform specific null device instead of /dev/null.
+
 2009-06-19  Adam Treat  <adam.treat at torchmobile.com>
 
         Reviewed by Oliver Hunt.
diff --git a/SunSpider/sunspider b/SunSpider/sunspider
index 635d093..7825a63 100755
--- a/SunSpider/sunspider
+++ b/SunSpider/sunspider
@@ -160,7 +160,8 @@ sub writePrefixFile()
 sub runTestsOnce($)
 {
     my ($useShark) = @_;
-    my $shellArgs = $jsShellArgs . " -f $prefixFile -f resources/sunspider-standalone-driver.js 2> /dev/null";
+    my $nullDevice = ($^O eq "MSWin32") ? "NUL" : "/dev/null";
+    my $shellArgs = $jsShellArgs . " -f $prefixFile -f resources/sunspider-standalone-driver.js 2> " . $nullDevice;
     my $output;
     if ($useShark) {
         my $intervalArg = $useShark == 20 ? "-I 20u" : "";

-- 
WebKit Debian packaging