Build master fix

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start): Don't try to concatenate a list and a string.

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

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 9139e31308e846ce8cc8d0176ae6b6a2985e38a3..5d0d6c05d43b4f29e6275e074ed52dd824d2b143 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -204,7 +204,7 @@ class RunWebKitTests(shell.Test):
         platform = self.getProperty('platform')
         appendCustomBuildFlags(self, platform)
         if platform == "win":
-            rootArgument = ['--root='] + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")
+            rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
         else:
             rootArgument = ['--root=WebKitBuild/bin']
         if self.skipBuild:

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6e8cf87a188b0ca33744bd9ebb6b2df9d7da5398..69afbe2f3a8bf3f53d4cd0160b289887b38876bc 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-07  Adam Roben  <aroben@apple.com>
+
+        Build master fix
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests.start): Don't try to concatenate a list and a string.
+
 2011-01-07  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 
         Reviewed by Csaba Osztrogonác.