[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 404f1dc92371602f1d301c47a494eba41d164a31
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 15:57:55 2010 +0000

    Notify user that run-webkit-tests has to be run under Cygwin
    
    Reviewed by Simon Hausmann.
    
    The script will bail out if run under Windows shell or Msys.
    
    * Scripts/run-webkit-tests:
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 03d321f..b1f617c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -193,6 +193,17 @@
 
         Reviewed by Simon Hausmann.
 
+        Notify user that run-webkit-tests has to be run under Cygwin
+
+        The script will bail out if run under Windows shell or Msys.
+
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+
+2010-02-05  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Generate convenience headers (QWebView, etc) using qmake
 
         In Qt this is done using syncqt, but we use a pro-file instead
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index a46146e..56011e6 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -158,6 +158,11 @@ my $shouldWaitForHTTPD = 0;
 
 my @leaksFilenames;
 
+if (isWindows() || isMsys()) {
+    print "This script has to be run under Cygwin to function correctly.\n";
+    exit 1;
+}
+
 # Default to --no-http for wx for now.
 $testHTTP = 0 if (isWx());
 
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index fe3277d..1ee69a3 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -954,6 +954,11 @@ sub isWindows()
     return ($^O eq "MSWin32") || 0;
 }
 
+sub isMsys()
+{
+    return ($^O eq "msys") || 0;
+}
+
 sub isLinux()
 {
     return ($^O eq "linux") || 0;

-- 
WebKit Debian packaging