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

[mojca at macports.org]

Revision: 151249
          https://trac.macports.org/changeset/151249
Author:   mojca at macports.org
Date:     2016-08-10 21:28:03 -0700 (Wed, 10 Aug 2016)
Log Message:
-----------
buildbot-test: use os.path.dir to construct paths, no need for /opt/local/bin in PATH

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

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-08-11 04:27:40 UTC (rev 151248)
+++ contrib/buildbot-test/master.cfg	2016-08-11 04:28:03 UTC (rev 151249)
@@ -31,6 +31,9 @@
 slaveprefix  = "/opt/local"
 toolsprefix  = "/opt/mports"
 
+path_base  = "/usr/bin:/bin:/usr/sbin:/sbin"
+path_ports = os.path.join(toolsprefix, "bin") + ":" + path_base
+
 if os.path.exists(_path('config.json')):
     with open(_path('config.json')) as f:
         configdata = json.load(f)
@@ -185,7 +188,7 @@
 base_factory.addStep(SVN(
     repourl='https://svn.macports.org/repository/macports/trunk/base',
     method="copy",
-    env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}))
+    env={"PATH": path_ports})
 base_factory.addStep(Configure(command=WithProperties("""
 env PATH=/usr/bin:/bin:/usr/sbin:/sbin ./configure --enable-readline \
     --prefix=%(workdir)s/opt/local \
@@ -287,11 +290,11 @@
     # get mp-buildbot; we'll do the checkout of base and dports via these scripts
     portwatcher_factory.addStep(SVN(
         repourl=mpbbsvnurl,
-        env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"},
+        env={"PATH": path_ports},
         alwaysUseLatest=True,
         preferLastChangedRev=True,
         mode="incremental",
-        workdir=portwatcher_factory.workdir+"/mpbb",
+        workdir=os.path.join(portwatcher_factory.workdir, "mpbb"),
         haltOnFailure=True))
 
     portwatcher_factory.addStep(ShellCommand(
@@ -368,7 +371,7 @@
 
 portbuilder_factory = BuildFactory()
 portbuilder_factory.workdir = '../build'
-logdir = "{}/logs".format(portbuilder_factory.workdir)
+logdir = os.path.join(portbuilder_factory, "logs")
 
 # XXX: use InfoStep instead of running a dummy command
 portbuilder_factory.addStep(ShellCommand(
@@ -381,7 +384,7 @@
     name="install-dependencies",
     description=["installing", "dependencies"],
     descriptionDone=["install", "dependencies"],
-    logfiles={"dependencies": "{}/dependencies-progress.txt".format(logdir)},
+    logfiles={"dependencies": os.path.join(logdir, "dependencies-progress.txt")},
     haltOnFailure=True))
 
 portbuilder_factory.addStep(Compile(
@@ -446,7 +449,7 @@
                 slavenames=["base-" + plat],
                 factory=base_factory,
                 tags=["base", os],
-                env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
+                env={"PATH": path_base})]
     if 'linux' not in plat:
         c['builders'] += [
             BuilderConfig(
@@ -454,13 +457,13 @@
                 slavenames=["ports-" + plat],
                 factory=make_portwatcher_factory("ports-" + plat + "-trigger"),
                 tags=["portwatcher", os],
-                env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}),
+                env={"PATH": path_ports}),
             BuilderConfig(
                 name="ports-" + plat + "-builder",
                 slavenames=["ports-" + plat],
                 factory=portbuilder_factory,
                 tags=["portbuilder", os],
-                env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
+                env={"PATH": path_ports)]
 
 ####### STATUS TARGETS
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160810/a5ddfc70/attachment-0001.html>