# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1630007835 14400
# Node ID 2e1359850798fb674d6a80320fefb84100f04681
# Parent  ba54973baf45f555204c33bd37e068bbe8f40b9f
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.

diff -r ba54973baf45 -r 2e1359850798 master.cfg
--- a/master.cfg	Wed Aug 25 22:41:22 2021 -0400
+++ b/master.cfg	Thu Aug 26 15:57:15 2021 -0400
@@ -302,8 +302,13 @@
   return Configure (command = conf_cmd, workdir = "build", env = build_env)
 
 
-def mk_octave_compile_step (nice = 0, opts = []):
-  make_cmd = build_cmd_list (["make", "V=1"], nice = nice, opts = opts)
+def mk_octave_compile_step (nice = 0, opts = [], xvfb = True):
+  if xvfb:
+    cmd = ["xvfb-run", "-a", "-s", "-screen 0 640x480x24"]
+  else:
+    cmd = []
+  cmd.extend (["make", "V=1"])
+  make_cmd = build_cmd_list (cmd, nice = nice, opts = opts)
   return Compile (command = make_cmd, workdir = "build", env = build_env,
                   warningPattern = ":[0-9][0-9]*:[0-9][0-9]*:warning: ")
 
@@ -404,7 +409,7 @@
   factory.addStep (sh_rm_build_dir)
   factory.addStep (sh_mk_build_dir)
   factory.addStep (mk_octave_configure_step (nice = nice, opts = configure_opts))
-  factory.addStep (mk_octave_compile_step (nice = nice, opts = compile_opts))
+  factory.addStep (mk_octave_compile_step (nice = nice, opts = compile_opts, xvfb = xvfb))
   factory.addStep (mk_octave_test_step (nice = nice, xvfb = xvfb))
 
   return factory