2006-08-27 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed by Eric, landed by Anders.

        Add DumpRenderTree support for Qt/Linux.

        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Added.
        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp: Added.
        (WebCore::DumpRenderTree::DumpRenderTree):
        (WebCore::DumpRenderTree::~DumpRenderTree):
        (WebCore::DumpRenderTree::open):
        (WebCore::DumpRenderTree::readStdin):
        (WebCore::DumpRenderTree::checkLoaded):
        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h: Added.
        * DumpRenderTree/DumpRenderTree.qtproj/main.cpp: Added.
        (main):
        * Scripts/build-dumprendertree:
        * Scripts/run-webkit-tests:
        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4fe3087d8ffff4ed40910b84f4b06142adc7458d..a6755a7a9ec136dfe0d211e62533f4ba43086230 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2006-08-27  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Eric, landed by Anders.
+
+        Add DumpRenderTree support for Qt/Linux.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Added.
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp: Added.
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::~DumpRenderTree):
+        (WebCore::DumpRenderTree::open):
+        (WebCore::DumpRenderTree::readStdin):
+        (WebCore::DumpRenderTree::checkLoaded):
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h: Added.
+        * DumpRenderTree/DumpRenderTree.qtproj/main.cpp: Added.
+        (main):
+        * Scripts/build-dumprendertree:
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitdirs.pm:
+
 2006-08-24  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Eric. Landed by rwlbuis.

diff --git a/WebKitTools/Scripts/build-dumprendertree b/WebKitTools/Scripts/build-dumprendertree
index 436eff78d22242ff839be0b0bff138540a59dffe..3ea7af1cead992c43ee6cf0c9fc187f419e5600e 100755 (executable)
--- a/WebKitTools/Scripts/build-dumprendertree
+++ b/WebKitTools/Scripts/build-dumprendertree
@@ -48,6 +48,9 @@ if (isOSX()) {
     $result = system "xcodebuild", "-project", "DumpRenderTree.xcodeproj", @options;
 } elsif (isCygwin()) {
     $result = buildVisualStudioProject("DumpRenderTree");
+} elsif (isQt()) {
+    $result = 1;
+    print "Please build DumpRenderTree yourself! Automatic compilation not supported yet!\n";
 } else {
     die "Building not defined for this platform!\n";
 }

diff --git a/WebKitTools/Scripts/install-win-extras b/WebKitTools/Scripts/install-win-extras
index 83ebb51e3765e1ffb1bae3fb47d64914d009fc94..ed34a1a9a2a6fd308dd60f808ab8d09c8c8fc48a 100755 (executable)
--- a/WebKitTools/Scripts/install-win-extras
+++ b/WebKitTools/Scripts/install-win-extras
@@ -55,7 +55,7 @@ if (! -e "icu-3.4-win32-msvc7.1.zip") {
 if (! -e "iconv-1.9.1.win32.zip") {
     print "Downloading iconv-1.9.1.win32.zip...\n\n";
     `rm -rf iconv*`;
-    `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
+    `curl -O http://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
     print "\nInstalling iconv-1.9.1.win32.zip...\n";
     `unzip iconv-1.9.1.win32.zip`;
     `rm -rf ../iconv`;
@@ -66,7 +66,7 @@ if (! -e "iconv-1.9.1.win32.zip") {
 if (! -e "libxml2-2.6.23.win32.zip") {
     print "Downloading libxml2-2.6.23.win32.zip...\n\n";
     `rm -rf libxml*`;
-    `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
+    `curl -O http://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
     print "\nInstalling libxml2-2.6.23.win32.zip...\n";
     `unzip libxml2-2.6.23.win32.zip`;
     `rm -rf ../libxml`;
@@ -77,7 +77,7 @@ if (! -e "libxml2-2.6.23.win32.zip") {
 if (! -e "libxslt-1.1.15.win32.zip") {
     print "Downloading libxmslt-1.1.15.win32.zip...\n";
     `rm -rf libxslt*`;
-    `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
+    `curl -O http://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
     print "Installing libxmslt-1.1.15.win32.zip...\n";
     `unzip libxslt-1.1.15.win32.zip`;
     `rm -rf ../libxslt`;
@@ -88,7 +88,7 @@ if (! -e "libxslt-1.1.15.win32.zip") {
 if (! -e "zlib-1.2.3.win32.zip") {
     print "Downloading zlib-1.2.3.win32.zip...\n\n";
     `rm -rf zlib*`;
-    `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
+    `curl -O http://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
     print "\nInstalling zlib-1.2.3.win32.zip...\n";
     `unzip zlib-1.2.3.win32.zip`;
     `rm -rf ../zlib`;

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 88488873e1fd1a3f9933e9429dbb364e8cfdc8a3..9c63f16f0acbb2056df805e2ddfda9a0d575e63d 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -786,7 +786,14 @@ sub openDumpRenderTreeIfNeeded()
 {
     return if $toolOpen;
 
+    # Save some requires variables for the linux environment...
+    my $homeDir = $ENV{'HOME'};
+    my $dbusAddress = $ENV{'DBUS_SESSION_BUS_ADDRESS'};
+
     local %ENV;
+    $ENV{DISPLAY} = ":0" if isQt();
+    $ENV{HOME} = $homeDir if isQt();
+    $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress if isQt();
     $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
     $ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995>
     $ENV{MallocStackLogging} = 1 if $checkLeaks;

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index c1dc8af1351953014b694e7b60401f15c68273ac..48c45338751693d319b7a362c25b22f298e6b1b8 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -125,6 +125,11 @@ sub determineConfiguration
     } else {
         $configuration = "Release";
     }
+
+    if (isQt()) {
+        # We only support one build type for now
+        $configuration = "";
+    }
 }
 
 sub determineConfigurationProductDir
@@ -257,6 +262,10 @@ sub builtDylibPathForName
     if (isCygwin()) {
         return "$baseProductDir/$framework.intermediate/$configuration/$framework.intermediate/$framework.lib";
     }
+    if (isQt()) {
+        return "$baseProductDir/../../../$framework";
+    }
+
     die "Unsupported platform, can't determine built library locations.";
 }
 
@@ -273,8 +282,14 @@ sub checkFrameworks
 
 sub hasSVGSupport
 {
-    return 0 if isCygwin(); 
+    return 0 if isCygwin();
+
     my $path = shift;
+
+    if ((isQt()) and ($path =~ /WebCore/)) {
+        $path .= "/../lib/libWebCore-unity.so";
+    }
+
     open NM, "-|", "nm", $path or die;
     my $hasSVGSupport = 0;
     while (<NM>) {
@@ -288,10 +303,10 @@ sub removeLibraryDependingOnSVG
 {
     my $frameworkName = shift;
     my $shouldHaveSVG = shift;
-    
+
     my $path = builtDylibPathForName($frameworkName);
     return unless -x $path;
-    
+
     my $hasSVG = hasSVGSupport($path);
     system "rm -f $path" if ($shouldHaveSVG xor $hasSVG);
 }
@@ -308,6 +323,10 @@ sub checkWebCoreSVGSupport
     return $hasSVG;
 }
 
+sub isQt()
+{
+    return ($^O eq "linux") and defined($ENV{'QTDIR'})
+}
 
 sub isCygwin()
 {