[zorg] r367272 - Removed unused llgo builder.
Galina Kistanova via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 29 16:04:26 PDT 2019
Author: gkistanova
Date: Mon Jul 29 16:04:26 2019
New Revision: 367272
URL: http://llvm.org/viewvc/llvm-project?rev=367272&view=rev
Log:
Removed unused llgo builder.
Removed:
zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/master.cfg
Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=367272&r1=367271&r2=367272&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jul 29 16:04:26 2019
@@ -3,7 +3,6 @@ from zorg.buildbot.builders import LLVMB
from zorg.buildbot.builders import PollyBuilder
from zorg.buildbot.builders import LLDBBuilder
from zorg.buildbot.builders import LLDBuilder
-from zorg.buildbot.builders import LLGoBuilder
from zorg.buildbot.builders import ClangAndLLDBuilder
from zorg.buildbot.builders import SanitizerBuilder
from zorg.buildbot.builders import SanitizerBuilderII
@@ -988,16 +987,6 @@ def _get_lld_builders():
]
-# llgo builders.
-def _get_llgo_builders():
- return [
- ]
-#Offline
-{'name': "llgo-x86_64-linux",
- 'slavenames': ["llgo-builder"],
- 'builddir': "llgo-x86_64-linux",
- 'factory': LLGoBuilder.getLLGoBuildFactory()},
-
# Sanitizer builders.
def _get_sanitizer_builders():
return [
@@ -1589,10 +1578,6 @@ def get_builders():
b['category'] = 'lldb'
yield b
- for b in _get_llgo_builders():
- b['category'] = 'llgo'
- yield b
-
for b in _get_sanitizer_builders():
b['category'] = 'sanitizer'
yield b
Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=367272&r1=367271&r2=367272&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Mon Jul 29 16:04:26 2019
@@ -48,7 +48,6 @@ c['change_source'].append(LLVMPoller(pro
"libunwind",
"lld",
"lldb",
- "llgo",
"openmp",
"lnt",
"test-suite"]))
@@ -213,14 +212,6 @@ c['schedulers'].append(SingleBranchSched
"libcxxabi",
"libunwind"])))
-c['schedulers'].append(SingleBranchScheduler(name="llgo_scheduler",
- treeStableTimer=2*60,
- builderNames=get_all_for("llgo"),
- change_filter=depends_on([
- "llvm",
- "cfe",
- "llgo"])))
-
c['schedulers'].append(Nightly(name="aosp_scheduler",
builderNames=get_all_for("aosp"),
hour=19,
Removed: zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py?rev=367271&view=auto
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLGoBuilder.py (removed)
@@ -1,111 +0,0 @@
-import os
-
-import buildbot
-import buildbot.process.factory
-from buildbot.steps.source import SVN
-from buildbot.steps.shell import ShellCommand, SetProperty
-
-from zorg.buildbot.commands.NinjaCommand import NinjaCommand
-
-# NOTE: The llgo builder does not currently support Windows,
-# on account of the shell commands. That's okay for now, as
-# llgo is only tested and known to work on Linux x86-64.
-
-def getLLGoBuildFactory(
- clean=True,
- build_type='Release+Asserts',
- test_libgo=True, # run 'check-libgo' target if True
- ):
- llvm_srcdir = "llvm.src"
- llvm_objdir = "llvm.obj"
- llgo_srcdir = '%s/tools/llgo' % llvm_srcdir
- clang_srcdir = '%s/tools/clang' % llvm_srcdir
-
- f = buildbot.process.factory.BuildFactory()
- # Determine the build directory.
- f.addStep(SetProperty(name="get_builddir",
- command=["pwd"],
- property="builddir",
- description="set build dir",
- workdir="."))
- # Get LLVM, clang and llgo
- f.addStep(SVN(name='svn-llvm',
- mode='update',
- baseURL='http://llvm.org/svn/llvm-project/llvm/',
- defaultBranch='trunk',
- workdir=llvm_srcdir))
- f.addStep(SVN(name='svn-clang',
- mode='update',
- baseURL='http://llvm.org/svn/llvm-project/cfe/',
- defaultBranch='trunk',
- workdir=clang_srcdir))
- f.addStep(SVN(name='svn-llgo',
- mode='update',
- baseURL='http://llvm.org/svn/llvm-project/llgo/',
- defaultBranch='trunk',
- workdir=llgo_srcdir))
-
- # Clean build directory, if requested.
- f.addStep(ShellCommand(name="rm-llvm_objdir",
- command=["rm", "-rf", llvm_objdir],
- haltOnFailure=True,
- description=["rm build dir", "llvm"],
- workdir=".",
- doStepIf=clean))
-
- # Create configuration files with cmake
- f.addStep(ShellCommand(name="create-build-dir",
- command=["mkdir", "-p", llvm_objdir],
- haltOnFailure=False,
- description=["create build dir"],
- workdir="."))
- cmakeCommand = [
- "cmake", "-G", "Ninja",
- "../%s" %llvm_srcdir,
- "-DCMAKE_BUILD_TYPE=" + build_type,
- ]
- f.addStep(ShellCommand(name="cmake-configure",
- command=cmakeCommand,
- haltOnFailure=False,
- description=["cmake configure"],
- workdir=llvm_objdir))
-
- # Build llgo
- f.addStep(NinjaCommand(name="build_llgo",
- targets=["llgo"],
- 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"],
- haltOnFailure=True,
- description=["test llgo"],
- workdir=llvm_objdir))
- # Test libgo
- f.addStep(NinjaCommand(name="test_libgo",
- targets=["check-libgo"],
- haltOnFailure=True,
- description=["test libgo"],
- workdir=llvm_objdir))
- return f
-
More information about the llvm-commits
mailing list