Skip to content

Commit

Permalink
Merge branch 'buildbot-0.8.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
djmitche committed Jun 5, 2013
2 parents 1b52566 + fd2a09c commit 6a49388
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
22 changes: 11 additions & 11 deletions master/buildbot/process/factory.py
Expand Up @@ -87,25 +87,25 @@ def __init__(self, source, configure="./configure",
else:
assert isinstance(configure, (list, tuple))
command = configure + configureFlags
self.addStep(Configure, command=command, env=configureEnv)
self.addStep(Configure(command=command, env=configureEnv))
if compile is not None:
self.addStep(Compile, command=compile)
self.addStep(Compile(command=compile))
if test is not None:
self.addStep(Test, command=test)
self.addStep(Test(command=test))

class CPAN(BuildFactory):
def __init__(self, source, perl="perl"):
BuildFactory.__init__(self, [source])
self.addStep(Configure, command=[perl, "Makefile.PL"])
self.addStep(Compile, command=["make"])
self.addStep(PerlModuleTest, command=["make", "test"])
self.addStep(Configure(command=[perl, "Makefile.PL"]))
self.addStep(Compile(command=["make"]))
self.addStep(PerlModuleTest(command=["make", "test"]))

class Distutils(BuildFactory):
def __init__(self, source, python="python", test=None):
BuildFactory.__init__(self, [source])
self.addStep(Compile, command=[python, "./setup.py", "build"])
self.addStep(Compile(command=[python, "./setup.py", "build"]))
if test is not None:
self.addStep(Test, command=test)
self.addStep(Test(command=test))

class Trial(BuildFactory):
"""Build a python module that uses distutils and trial. Set 'tests' to
Expand Down Expand Up @@ -137,15 +137,15 @@ def __init__(self, source,

from buildbot.steps.python_twisted import Trial
buildcommand = buildpython + ["./setup.py", "build"]
self.addStep(Compile, command=buildcommand, env=env)
self.addStep(Trial,
self.addStep(Compile(command=buildcommand, env=env))
self.addStep(Trial(
python=trialpython, trial=self.trial,
testpath=testpath,
tests=tests, testChanges=useTestCaseNames,
randomly=self.randomly,
recurse=self.recurse,
env=env,
)
))


# compatibility classes, will go away. Note that these only offer
Expand Down
2 changes: 2 additions & 0 deletions master/docs/relnotes/0.8.8.rst
Expand Up @@ -74,6 +74,8 @@ Features
* Master-side support for P4 is available, and provides a great deal more flexibility than the old slave-side step.
See :bb:pull:`596`.

* GNUAutoconf and other pre-defined factories now work correctly (:bb:bug:`2402`)

Deprecations, Removals, and Non-Compatible Changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down

0 comments on commit 6a49388

Please sign in to comment.