Reviewed by Anders.
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Oct 2006 17:21:29 +0000 (17:21 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Oct 2006 17:21:29 +0000 (17:21 +0000)
        Some fixes to get the Qt BuildSlave to run the LayoutTests.

        * Scripts/build-dumprendertree: No need to call cmake again.
        * Scripts/run-webkit-tests: Expose LD_LIBRARY_PATH.

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

WebKitTools/ChangeLog
WebKitTools/Scripts/build-dumprendertree
WebKitTools/Scripts/run-webkit-tests

index af87f475bb348e17845275d01ede38b3b7481c09..085ae8f93a0dc3998f35b17fbb2d9ee2a9458269 100644 (file)
@@ -1,3 +1,12 @@
+2006-10-14  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Anders.
+
+        Some fixes to get the Qt BuildSlave to run the LayoutTests.
+
+        * Scripts/build-dumprendertree: No need to call cmake again.
+        * Scripts/run-webkit-tests: Expose LD_LIBRARY_PATH.
+
 2006-10-13  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Eric.
index 702155b41f2eec4229d8b72414028515444424ce..b7e65075a1276f1f597846ff2b8989cd3da0b1f1 100755 (executable)
@@ -49,8 +49,8 @@ if (isOSX()) {
 } elsif (isCygwin()) {
     $result = buildVisualStudioProject("DumpRenderTree");
 } elsif (isQt()) {
-    # Qt/Linux builds everything in one-shot.
-    $result = buildCMakeProject("WebKit", 1);
+    # Qt/Linux builds everything in one-shot. No need to build anything here.
+    $result = 0;
 } else {
     die "Building not defined for this platform!\n";
 }
index 53cc9df8cc6da556853acf458c845f668041fb5f..604cd913e1ab0163f9fc9801e8ae9b19d381fcc2 100755 (executable)
@@ -809,11 +809,13 @@ sub openDumpRenderTreeIfNeeded()
 
     # Save some requires variables for the linux environment...
     my $homeDir = $ENV{'HOME'};
+    my $libraryPath = $ENV{'LD_LIBRARY_PATH'};
     my $dbusAddress = $ENV{'DBUS_SESSION_BUS_ADDRESS'};
 
     local %ENV;
     $ENV{DISPLAY} = ":0" if isQt();
     $ENV{HOME} = $homeDir if isQt();
+    $ENV{LD_LIBRARY_PATH} = $libraryPath 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>