Changeset 2672

Show
Ignore:
Timestamp:
03/06/08 11:13:33 (9 months ago)
Author:
hans
Message:

Be smarter about command string generation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • buildbot/master/master.cfg

    r2671 r2672  
    4040from buildbot.process import factory 
    4141 
    42 compilers = {   "sbcl" : "sbcl --disable-debugger --no-sysinit --no-userinit --load build.lisp --eval", 
    43                 "ccl" : "ccl -n -b -l build.lisp -e", 
    44                 "cmucl" : "lisp -noinit -nositeinit -batch -load build.lisp -e" } 
     42compilers = {   "sbcl" : "sbcl --disable-debugger --no-sysinit --no-userinit --load %s --eval %s", 
     43                "ccl" : "ccl -n -b -l %s -e %s", 
     44                "cmucl" : "lisp -noinit -nositeinit -batch -load %s -e %s" } 
    4545 
    4646def make_factory(branch, compiler): 
    4747        f = factory.BuildFactory() 
    4848        f.addStep(source.SVN(svnurl="svn://bknr.net/svn/" + branch)) 
    49         f.addStep(shell.ShellCommand(command=compilers[compiler].split(" ") + ["(build::build)"], 
    50                                        description=["build"])) 
    51         f.addStep(shell.ShellCommand(command=compilers[compiler].split(" ") + ["(build::test)"], 
    52                                        description=["test"])) 
     49        f.addStep(shell.ShellCommand(command=compilers[compiler] % ("build.lisp", "(build::build)"), 
     50                                     description=["build"])) 
     51        f.addStep(shell.ShellCommand(command=compilers[compiler] % ("build.lisp", "(build::test)"), 
     52                                     description=["test"])) 
    5353        return f 
    5454