This is an archive of the discontinued LLVM Phabricator instance.

Differential D69467

Added support for git/github to SanitizerBuilder
ClosedPublic

Authored by andreil99 on Oct 26 2019, 2:13 PM.

Details

Reviewers
gkistanova
eugenis
vvereschaka
aorlov
Commits
rZORGc88411402025: Added support for git/github to SanitizerBuilder.
Summary

Now SanitizerBuilder supports both a "legacy mode" with SVN checkout and a git/github checkout

is_legacy_mode is False by default since we have migrated the build bot to github.

Diff Detail

Event Timeline

andreil99 created this revision.Oct 26 2019, 2:13 PM
Herald added a subscriber: llvm-commits. · View Herald TranscriptOct 26 2019, 2:13 PM
gkistanova accepted this revision.Oct 26 2019, 6:10 PM

LGTM

This revision is now accepted and ready to land.Oct 26 2019, 6:10 PM
eugenis accepted this revision.Oct 28 2019, 10:15 AM

LGTM

vvereschaka accepted this revision.Oct 28 2019, 10:31 AM

LGTM

andreil99 closed this revision.Nov 6 2019, 8:56 PM

Revision Contents

PathSize
zorg/
buildbot/
builders/
57 lines

Diff 226553

zorg/buildbot/builders/SanitizerBuilder.py

import os from buildbot.steps.shell import SetProperty
import buildbot
import buildbot.process.factory
from buildbot.steps.source import SVN, Git
from buildbot.process.properties import WithProperties from buildbot.process.properties import WithProperties
from zorg.buildbot.commands.AnnotatedCommand import AnnotatedCommand from zorg.buildbot.commands.AnnotatedCommand import AnnotatedCommand
from zorg.buildbot.process.factory import LLVMBuildFactory
def getSanitizerBuildFactory( def getSanitizerBuildFactory(
clean=False, clean=False,
depends_on_projects=None,
env=None, env=None,
timeout=1200): timeout=1200):
Context not available.
if env is not None: if env is not None:
merged_env.update(env) merged_env.update(env)
f = buildbot.process.factory.BuildFactory() if depends_on_projects is None:
depends_on_projects = [
"llvm",
"clang",
"compiler-rt",
"libcxx",
"libcxxabi",
"libunwind",
"lld"]
# Explicitly use '/' as separator, because it works on *nix and Windows.
sanitizer_script_dir = "sanitizer_buildbot/sanitizers"
sanitizer_script = "../%s/zorg/buildbot/builders/sanitizers/%s" % (sanitizer_script_dir, "buildbot_selector.py")
f = LLVMBuildFactory(
is_legacy_mode=False,
clean=clean,
depends_on_projects=depends_on_projects,
llvm_srcdir=sanitizer_script_dir)
# Determine the build directory. # Determine the build directory.
f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir", f.addStep(SetProperty(name="get_builddir",
command=["pwd"], command=["pwd"],
property="builddir", property="builddir",
description="set build dir", description="set build dir",
workdir=".", workdir=".",
env=merged_env)) env=merged_env))
sanitizer_buildbot = "sanitizer_buildbot"
sanitizer_script_dir = os.path.join(sanitizer_buildbot, "sanitizers")
# Get sanitizer buildbot scripts. # Get sanitizer buildbot scripts.
f.addStep(SVN(name='svn-sanitizer-buildbot', f.addGetSourcecodeForProject(
mode='update', name='update-annotate-scripts',
svnurl='http://llvm.org/svn/llvm-project/zorg/trunk/' project='zorg',
'zorg/buildbot/builders/sanitizers', src_dir=sanitizer_script_dir,
workdir=sanitizer_script_dir, alwaysUseLatest=True)
alwaysUseLatest=True))
sanitizer_script = os.path.join("..", sanitizer_script_dir, "buildbot_selector.py")
# Run annotated command for sanitizer. # Run annotated command for sanitizer.
f.addStep(AnnotatedCommand(name="annotate", f.addStep(AnnotatedCommand(name="annotate",
Context not available.