Mercurial > octave-buildbot

comparison master.cfg @ 36:2e1359850798

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
execute compile step with xvfb-run * master.cfg (mk_octave_compile_step): Execute make with xvfb-run if new xvfb argument is True. (mk_octave_factory): Pass xvfb option on to mk_octave_compile_step.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Aug 2021 15:57:15 -0400
parents ba54973baf45
children f42084477c28
comparison
equal deleted inserted replaced
35:ba54973baf45 36:2e1359850798
300 def mk_octave_configure_step (nice = 0, opts = []): 300 def mk_octave_configure_step (nice = 0, opts = []):
301 conf_cmd = build_cmd_list ("../src/configure", nice = nice, opts = opts) 301 conf_cmd = build_cmd_list ("../src/configure", nice = nice, opts = opts)
302 return Configure (command = conf_cmd, workdir = "build", env = build_env) 302 return Configure (command = conf_cmd, workdir = "build", env = build_env)
303 303
304 304
305 def mk_octave_compile_step (nice = 0, opts = []): 305 def mk_octave_compile_step (nice = 0, opts = [], xvfb = True):
306 make_cmd = build_cmd_list (["make", "V=1"], nice = nice, opts = opts) 306 if xvfb:
307 cmd = ["xvfb-run", "-a", "-s", "-screen 0 640x480x24"]
308 else:
309 cmd = []
310 cmd.extend (["make", "V=1"])
311 make_cmd = build_cmd_list (cmd, nice = nice, opts = opts)
307 return Compile (command = make_cmd, workdir = "build", env = build_env, 312 return Compile (command = make_cmd, workdir = "build", env = build_env,
308 warningPattern = ":[0-9][0-9]*:[0-9][0-9]*:warning: ") 313 warningPattern = ":[0-9][0-9]*:[0-9][0-9]*:warning: ")
309 314
310 import re 315 import re
311 from buildbot.process import logobserver 316 from buildbot.process import logobserver
402 factory.addStep (mk_octave_hg_update_step (octave_hg_repo, branch)) 407 factory.addStep (mk_octave_hg_update_step (octave_hg_repo, branch))
403 factory.addStep (mk_octave_bootstrap_step (nice = nice)) 408 factory.addStep (mk_octave_bootstrap_step (nice = nice))
404 factory.addStep (sh_rm_build_dir) 409 factory.addStep (sh_rm_build_dir)
405 factory.addStep (sh_mk_build_dir) 410 factory.addStep (sh_mk_build_dir)
406 factory.addStep (mk_octave_configure_step (nice = nice, opts = configure_opts)) 411 factory.addStep (mk_octave_configure_step (nice = nice, opts = configure_opts))
407 factory.addStep (mk_octave_compile_step (nice = nice, opts = compile_opts)) 412 factory.addStep (mk_octave_compile_step (nice = nice, opts = compile_opts, xvfb = xvfb))
408 factory.addStep (mk_octave_test_step (nice = nice, xvfb = xvfb)) 413 factory.addStep (mk_octave_test_step (nice = nice, xvfb = xvfb))
409 414
410 return factory 415 return factory
411 416
412 417