diff --git a/zorg/buildbot/builders/FuchsiaBuilder.py b/zorg/buildbot/builders/FuchsiaBuilder.py --- a/zorg/buildbot/builders/FuchsiaBuilder.py +++ b/zorg/buildbot/builders/FuchsiaBuilder.py @@ -132,15 +132,27 @@ workdir=obj_dir, env=merged_env)) - # Test llvm, clang and lld. + # Test llvm and clang.. f.addStep(NinjaCommand(name="check", - targets=["stage2-check-%s" % p for p in ("llvm", "clang", "lld")], + targets=["stage2-check-%s" % p for p in ("llvm", "clang")], haltOnFailure=True, description=["check"], workdir=obj_dir, env=merged_env, doStepIf=test)) + # Run lld tests with only 32 jobs to prevent hitting EAGAIN. + lld_env = {} + lld_env.update(merged_env) + lld_env["LIT_OPTS"] = "-j32" + f.addStep(NinjaCommand(name="check", + targets=["stage2-check-lld"], + haltOnFailure=True, + description=["check"], + workdir=obj_dir, + env=lld_env, + doStepIf=test)) + # Install distribution. f.addStep(NinjaCommand(name="install", targets=["stage2-install-distribution"],