From 7fcde16522722a0651954a15c3328d2a9c60579f Mon Sep 17 00:00:00 2001 From: "sergio@webkit.org" Date: Wed, 27 Jun 2012 15:52:00 +0000 Subject: [PATCH] [WK2] [GTK] WebKit2 testing bot fails to run tests due to missing files https://bugs.webkit.org/show_bug.cgi?id=90061 Reviewed by Gustavo Noronha Silva. Add "-no-install -no-fast-install" to the LDFLAGS in bots. With this flag libtool tells the linker to set the rpath for the output file to the full path of the .libs directory, instead of using a wrapper script to set up the LD_LIBRARY_PATH. This will allow us to directly reuse builds in the pure testing bots. * BuildSlaveSupport/gtk/daemontools-buildbot.conf: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121345 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- .../gtk/daemontools-buildbot.conf | 1 + Tools/ChangeLog | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Tools/BuildSlaveSupport/gtk/daemontools-buildbot.conf b/Tools/BuildSlaveSupport/gtk/daemontools-buildbot.conf index 31a6d6394190..06af29f7b062 100644 --- a/Tools/BuildSlaveSupport/gtk/daemontools-buildbot.conf +++ b/Tools/BuildSlaveSupport/gtk/daemontools-buildbot.conf @@ -40,5 +40,6 @@ ccache_path="/usr/lib/ccache" # env_CFLAGS="-pipe" env_CXXFLAGS="-pipe" +env_LDFLAGS="-no-install -no-fast-install" env_WEBKIT_TESTFONTS="/home/${buildbot_user}/testfonts" diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 4c107b448e9f..6b201e23d548 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-06-27 Sergio Villar Senin + + [WK2] [GTK] WebKit2 testing bot fails to run tests due to missing files + https://bugs.webkit.org/show_bug.cgi?id=90061 + + Reviewed by Gustavo Noronha Silva. + + Add "-no-install -no-fast-install" to the LDFLAGS in bots. With + this flag libtool tells the linker to set the rpath for the output + file to the full path of the .libs directory, instead of using a + wrapper script to set up the LD_LIBRARY_PATH. This will allow us + to directly reuse builds in the pure testing bots. + + * BuildSlaveSupport/gtk/daemontools-buildbot.conf: + 2012-06-27 Tor Arne Vestbø [Qt] No need to save and restore TEMPLATE in a function -- 2.36.0