[llvm-commits] [zorg] r89780 - in /zorg/trunk/zorg/buildbot/builders: ClangBuilder.py LLVMBuilder.py LLVMGCCBuilder.py
Daniel Dunbar
daniel at zuster.org
Tue Nov 24 10:27:24 PST 2009
Author: ddunbar
Date: Tue Nov 24 12:27:23 2009
New Revision: 89780
URL: http://llvm.org/viewvc/llvm-project?rev=89780&view=rev
Log:
Allow clients to specify "make" command to use.
Modified:
zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=89780&r1=89779&r2=89780&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Nov 24 12:27:23 2009
@@ -12,7 +12,8 @@
from zorg.buildbot.commands.BatchFileDownload import BatchFileDownload
def getClangBuildFactory(triple=None, clean=True, test=True,
- expensive_checks=False, run_cxx_tests=False, valgrind=False):
+ expensive_checks=False, run_cxx_tests=False, valgrind=False,
+ make='make'):
f = buildbot.process.factory.BuildFactory()
# Determine the build directory.
@@ -48,13 +49,14 @@
descriptionDone=['configure',config_name]))
if clean:
f.addStep(WarningCountingShellCommand(name="clean-llvm",
- command="make clean",
+ command=[make, "clean"],
haltOnFailure=True,
description="cleaning llvm",
descriptionDone="clean llvm",
workdir='llvm'))
f.addStep(WarningCountingShellCommand(name="compile",
- command=WithProperties("nice -n 10 make -j%(jobs)d"),
+ command=['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure=True,
description="compiling llvm & clang",
descriptionDone="compile llvm & clang",
@@ -69,12 +71,12 @@
extraTestDirs += '%(builddir)s/llvm/tools/clang/utils/C++Tests'
if test:
f.addStep(ClangTestCommand(name='test-llvm',
- command=["make", "check-lit", "VERBOSE=1"],
+ command=[make, "check-lit", "VERBOSE=1"],
description=["testing", "llvm"],
descriptionDone=["test", "llvm"],
workdir='llvm'))
f.addStep(ClangTestCommand(name='test-clang',
- command=['make', 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
+ command=[make, 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
WithProperties('EXTRA_TESTDIRS=%s' % extraTestDirs)],
workdir='llvm/tools/clang'))
return f
Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=89780&r1=89779&r2=89780&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Tue Nov 24 12:27:23 2009
@@ -11,7 +11,7 @@
def getLLVMBuildFactory(triple=None, clean=True, test=True,
expensive_checks=False,
- jobs=1, timeout=20):
+ jobs=1, timeout=20, make='make'):
f = buildbot.process.factory.BuildFactory()
# Determine the build directory.
@@ -43,13 +43,14 @@
descriptionDone=['configure',config_name]))
if clean:
f.addStep(WarningCountingShellCommand(name="clean-llvm",
- command="make clean",
+ command=[make, 'clean'],
haltOnFailure=True,
description="cleaning llvm",
descriptionDone="clean llvm",
workdir='llvm'))
f.addStep(WarningCountingShellCommand(name="compile",
- command=WithProperties("nice -n 10 make -j%s" % jobs),
+ command=['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure=True,
description="compiling llvm",
descriptionDone="compile llvm",
@@ -57,7 +58,7 @@
timeout=timeout*60))
if test:
f.addStep(ClangTestCommand(name='test-llvm',
- command=["make", "check-lit", "VERBOSE=1"],
+ command=[make, "check-lit", "VERBOSE=1"],
description=["testing", "llvm"],
descriptionDone=["test", "llvm"],
workdir='llvm'))
Modified: zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py?rev=89780&r1=89779&r2=89780&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py Tue Nov 24 12:27:23 2009
@@ -34,7 +34,7 @@
gxxincludedir=None,
triple=None, build=None, host=None, target=None,
useTwoStage=True, stage1_config='Release',
- stage2_config='Release'):
+ stage2_config='Release', make='make'):
if build or host or target:
if not build or not host or not target:
raise ValueError,"Must specify all of 'build', 'host', 'target' if used."
@@ -93,7 +93,8 @@
# Build llvm (stage 1).
f.addStep(WarningCountingShellCommand(name = "compile.llvm.stage1",
- command = WithProperties("nice -n 10 make -j%s" % jobs),
+ command=['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure = True,
description=["compile",
"llvm",
@@ -103,7 +104,7 @@
# Run LLVM tests (stage 1).
f.addStep(ClangTestCommand(name = 'test.llvm.stage1',
- command = ["make", "check-lit", "VERBOSE=1"],
+ command = [make, "check-lit", "VERBOSE=1"],
description = ["testing", "llvm"],
descriptionDone = ["test", "llvm"],
workdir = 'llvm.obj'))
@@ -139,7 +140,8 @@
# Build llvm-gcc.
f.addStep(WarningCountingShellCommand(name="compile.llvm-gcc.stage1",
- command = WithProperties("nice -n 10 make -j%s" % jobs),
+ command=['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure=True,
description=["compile",
"llvm-gcc"],
@@ -156,7 +158,8 @@
# Install llvm-gcc.
f.addStep(WarningCountingShellCommand(name="install.llvm-gcc.stage1",
- command="nice -n 10 make install",
+ command=['nice', '-n', '10',
+ make, 'install'],
haltOnFailure=True,
description=["install",
"llvm-gcc"],
@@ -194,7 +197,8 @@
# Build LLVM (stage 2).
f.addStep(WarningCountingShellCommand(name = "compile.llvm.stage2",
- command = WithProperties("nice -n 10 make -j%s" % jobs),
+ command = ['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure = True,
description=["compile",
"llvm",
@@ -204,7 +208,7 @@
# Run LLVM tests (stage 2).
f.addStep(ClangTestCommand(name = 'test.llvm.stage2',
- command = ["make", "check-lit", "VERBOSE=1"],
+ command = [make, "check-lit", "VERBOSE=1"],
description = ["testing", "llvm", "(stage 2)"],
descriptionDone = ["test", "llvm", "(stage 2)"],
workdir = 'llvm.obj.2'))
@@ -235,7 +239,8 @@
# Build llvm-gcc (stage 2).
f.addStep(WarningCountingShellCommand(name="compile.llvm-gcc.stage2",
- command=WithProperties("nice -n 10 make -j%s" % jobs),
+ command=['nice', '-n', '10',
+ make, WithProperties("-j%s" % jobs)],
haltOnFailure=True,
description=["compile",
"llvm-gcc",
@@ -254,6 +259,8 @@
# Install llvm-gcc.
f.addStep(WarningCountingShellCommand(name="install.llvm-gcc.stage2",
+ command = ['nice', '-n', '10',
+ make, 'install'],
command="nice -n 10 make",
haltOnFailure=True,
description=["install",
More information about the llvm-commits
mailing list