[151006] contrib/buildbot-test/master.cfg

[ryandesign at macports.org]

Revision: 151006
          https://trac.macports.org/changeset/151006
Author:   ryandesign at macports.org
Date:     2016-08-05 07:11:31 -0700 (Fri, 05 Aug 2016)
Log Message:
-----------
buildbot-test: use a common workdir

Modified Paths:
--------------
    contrib/buildbot-test/master.cfg

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-08-05 14:09:02 UTC (rev 151005)
+++ contrib/buildbot-test/master.cfg	2016-08-05 14:11:31 UTC (rev 151006)
@@ -179,6 +179,8 @@
 from buildbot.steps.shell import ShellCommand, Compile, Configure, SetPropertyFromCommand
 
 base_factory = BuildFactory()
+base_factory.workdir = '../build'
+
 #base_factory.addStep(SVN(
 #   repourl=Interpolate('https://svn.macports.org/repository/macports/%(src::branch:-trunk)s/base'),
 base_factory.addStep(SVN(
@@ -280,13 +282,15 @@
 
 def make_portwatcher_factory(triggerable):
     portwatcher_factory = BuildFactory()
+    portwatcher_factory.workdir = '../build'
+
     # get mp-buildbot; we'll do the checkout of base and dports via these scripts
     portwatcher_factory.addStep(SVN(
         repourl=mpbbsvnurl,
         alwaysUseLatest=True,
         preferLastChangedRev=True,
         mode="incremental",
-        workdir="build/mpbb",
+        workdir=portwatcher_factory.workdir+"/mpbb",
         haltOnFailure=True))
 
     portwatcher_factory.addStep(ShellCommand(
@@ -337,6 +341,7 @@
 # -- Port Builder --
 
 portbuilder_factory = BuildFactory()
+portbuilder_factory.workdir = '../build'
 
 # XXX: use InfoStep instead of running a dummy command
 portbuilder_factory.addStep(ShellCommand(
@@ -349,7 +354,7 @@
     alwaysUseLatest=True,
     preferLastChangedRev=True,
     mode="incremental",
-    workdir="build/mpbb",
+    workdir=portbuilder_factory.workdir+"/mpbb",
     haltOnFailure=True))
 
 portbuilder_factory.addStep(ShellCommand(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160805/f1b96527/attachment.html>