Changeset 25670 in webkit

Timestamp:

Sep 20, 2007 4:05:39 AM (17 years ago)

Author:

ddkilzer

Message:

WebKitTools:

Reviewed by Adam.

Fix: ​http://bugs.webkit.org/show_bug.cgi?id=15223
webkitdir.pm::isQt() is not working properly in run-webkit-tests under Linux/Qt

Added determineIsQt() and determineIsGdk() to webkitdirs.pm.
Now isQt() and isGdk() use global variables that are only set once.

An array of all the parameters is now given to build-dumprender which includes
the platform on linux.

• Scripts/build-dumprendertree:
• Scripts/run-webkit-tests:
• Scripts/webkitdirs.pm:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (3 diffs)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-09-20  Julien Chaffraix  <julien.chaffraix@gmail.com>
+
+        Reviewed by Adam.
+
+        Fix: http://bugs.webkit.org/show_bug.cgi?id=15223
+        webkitdir.pm::isQt() is not working properly in run-webkit-tests under Linux/Qt
+
+        Added determineIsQt() and determineIsGdk() to webkitdirs.pm.
+        Now isQt() and isGdk() use global variables that are only set once.
+
+        An array of all the parameters is now given to build-dumprender which includes
+        the platform on linux.
+
+        * Scripts/build-dumprendertree:
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+
 2007-09-19  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -132 +132 @@
 } elsif (isQt()) {
     $platform = "qt";
+} elsif (isGdk()) {
+    $platform = "gdk";
 } elsif (isCygwin()) {
     # FIXME: The two lines below are a hack to represent that on Windows we
@@ -257 +259 @@
         $buildResult = buildVisualStudioProject("WebKitTools/DumpRenderTree/DumpRenderTree.sln");
     } else {
-        $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption;
+        # Push the parameters to build-dumprendertree as an array
+        my @args;
+        push(@args, $configuration);
+
+        if (isQt()) {
+            push(@args, "--qt");
+        } elsif (isGdk()) {
+            push(@args, "--gdk");
+        }
+
+        $buildResult = system "WebKitTools/Scripts/build-dumprendertree", @args;
     }
 
@@ -1121 +1133 @@
     my $homePath = $ENV{'HOMEPATH'};
         
-    my $isQt = isQt();
     local %ENV;
-    if ($isQt) {
+    if (isQt()) {
         if (defined $display) {
             $ENV{DISPLAY} = $display;

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -50 +50 @@
 my $currentSVNRevision;
 my $osXVersion;
+my $isQt;
+my $isGdk;
 
 # Variables for Win32 support
@@ -385 +387 @@
 sub isQt()
 {
+    determineIsQt();
+    return $isQt;
+}
+
+sub determineIsQt()
+{
+    return if defined($isQt);
+
     # Allow override in case QTDIR is not set.
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
         if ($opt =~ /^--qt/i ) {
-            return 1;
-        }
-    }
-    return defined($ENV{'QTDIR'})
+            $isQt = 1;
+            return;
+        }
+    }
+    $isQt = defined($ENV{'QTDIR'});
 }
 
 sub isGdk()
 {
+    determineIsGdk();
+    return $isGdk;
+}
+
+sub determineIsGdk()
+{
+    return if defined($isGdk);
+
     for my $i (0 .. $#ARGV) {
         my $opt = $ARGV[$i];
         if ($opt =~ /^--gdk$/i ) {
-            return 1;
-        }
-    }
-    return 0;
+            $isGdk = 1;
+            return;
+        }
+    }
+    $isGdk = 0;
 }