[zorg] r235938 - [zorg] llgo: add logfiles to build_libgo

[Andrew Wilkins]

Author: axw
Date: Mon Apr 27 18:19:09 2015
New Revision: 235938

URL: http://llvm.org/viewvc/llvm-project?rev=235938&view=rev
Log:
[zorg] llgo: add logfiles to build_libgo

Summary:
llgo's "libgo" target builds libgo by executing
a Make subprocess; the Make build sends output
to log files on disk, and not to stdio. On the
llgo-builder slave, the libgo build step takes
more than the default timeout (1200s) to complete,
which is killed due to lack of output on stdio.

This diff adds the log files to the build step,
so the step doesn't time out and to assist in
diagnosing build failures. We also explicitly
specify the libgo and llgoi targets as steps.

Test Plan: Tested with docker-zorg.

Reviewers: pcc, gkistanova

Reviewed By: gkistanova

Subscribers: axw, llvm-commits

Differential Revision: http://reviews.llvm.org/D9283

Modified:
    zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py?rev=235938&r1=235937&r2=235938&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py Mon Apr 27 18:19:09 2015
@@ -76,6 +76,25 @@ def getLLGoBuildFactory(
                            haltOnFailure=True,
                            description=["build llgo"],
                            workdir=llvm_objdir))
+    # Build libgo
+    f.addStep(NinjaCommand(name="build_libgo",
+                           targets=["libgo"],
+                           haltOnFailure=True,
+                           logfiles={
+                               'libgo-build-out': 'tools/llgo/libgo-prefix/src/libgo-stamp/libgo-build-out.log',
+                               'libgo-build-err': 'tools/llgo/libgo-prefix/src/libgo-stamp/libgo-build-err.log',
+                               'libgo-configure-out': 'tools/llgo/libgo-prefix/src/libgo-stamp/libgo-configure-out.log',
+                               'libgo-configure-err': 'tools/llgo/libgo-prefix/src/libgo-stamp/libgo-configure-err.log',
+                           },
+                           lazylogfiles=True,
+                           description=["build libgo"],
+                           workdir=llvm_objdir))
+    # Build llgoi
+    f.addStep(NinjaCommand(name="build_llgoi",
+                           targets=["llgoi"],
+                           haltOnFailure=True,
+                           description=["build llgoi"],
+                           workdir=llvm_objdir))
     # Test llgo
     f.addStep(NinjaCommand(name="test_llgo",
                            targets=["check-llgo"],