<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">At revision 194913.<br>
<br>
/usr/local/games:/usr/games removed from path. A few other
builders need this removed as well.<br>
<br>
Commented where clang-34 experimental for sanitizer build resides.<br>
+ # hexagon-build-03: /opt/usr/bin contains clang-3.4 for
sanitizer.<br>
(previous builder used /home/llvmbb)<br>
<br>
Thanks,<br>
Rick<br>
<br>
On 11/15/2013 07:30 PM, Rick Foos wrote:<br>
</div>
<blockquote cite="mid:5286CAAE.3070207@codeaurora.org" type="cite">
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
<div class="moz-cite-prefix">No, that was a leftover from before.<br>
<br>
I do need /opt/usr/bin for the clang-34 compiler. I'll comment,
and remove games.<br>
<br>
On 11/15/2013 07:24 PM, Galina Kistanova wrote:<br>
</div>
<blockquote
cite="mid:CAJ8eiNwG2-9=BVkHFqWg9zNrr7AUwZHZtCZ8KfwFRR2xv5j76A@mail.gmail.com"
type="cite">
<div dir="ltr">
<div>Do you really need /usr/local/games:/usr/games in the
PATH?</div>
<div><font face="tahoma">If you do, could you add the comment
why, please?<br>
<br>
</font></div>
<div><font face="tahoma">Thanks<br>
<br>
Galina<br>
</font></div>
</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote"> On Fri, Nov 15, 2013 at 5:09 PM,
Rick Foos <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:rfoos@codeaurora.org" target="_blank">rfoos@codeaurora.org</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex"> Patch
is posted. I'm going to drive home, get some dinner, and
check back in a bit.<br>
<br>
Thanks for all your help,<br>
Rick<br>
<br>
On 11/15/2013 06:12 PM, Galina Kistanova wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: gkistanova<br>
Date: Fri Nov 15 18:12:47 2013<br>
New Revision: 194896<br>
<br>
URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project?rev=194896&view=rev"
target="_blank">http://llvm.org/viewvc/llvm-project?rev=194896&view=rev</a><br>
Log:<br>
Reverted r194758. Please see <a moz-do-not-send="true"
href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-ubuntu-13.04/builds/9304/steps/build/logs/stdio"
target="_blank">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-ubuntu-13.04/builds/9304/steps/build/logs/stdio</a>
for the problem.<br>
<br>
Modified:<br>
zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
zorg/trunk/buildbot/osuosl/master/config/slaves.py<br>
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py<br>
<br>
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py<br>
URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=194896&r1=194895&r2=194896&view=diff"
target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=194896&r1=194895&r2=194896&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
(original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
Fri Nov 15 18:12:47 2013<br>
@@ -623,12 +623,6 @@ def _get_sanitizer_builders():<br>
'slavenames' :["sanitizer-buildbot2"],<br>
'builddir':
"sanitizer-x86_64-linux-bootstrap",<br>
'factory':
SanitizerBuilder.getSanitizerBuildFactory()},<br>
- {'name':
"llvm-clang-lld-x86_64-ubuntu-13.04-sanitize-address",<br>
- 'slavenames':["hexagon-build-03"],<br>
-
'builddir':"llvm-clang-lld-x86_64-ubuntu-13.04-fsanitize-address",<br>
- 'factory':
ClangAndLLDBuilder.getClangAndLLDBuildFactory(Option='-fsanitize=address',<br>
-
env={'PATH':'/opt/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games'},<br>
- jobs=12,loadaverage=32)},<br>
]<br>
# Experimental and stopped builders<br>
<br>
Modified:
zorg/trunk/buildbot/osuosl/master/config/slaves.py<br>
URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=194896&r1=194895&r2=194896&view=diff"
target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=194896&r1=194895&r2=194896&view=diff</a><br>
==============================================================================<br>
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
(original)<br>
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
Fri Nov 15 18:12:47 2013<br>
@@ -188,11 +188,7 @@ def get_build_slaves():<br>
create_slave("osu8", properties={'jobs' : 6},
max_builds=2),<br>
# Ubuntu 12.04 x86-64, Intel(R) Xeon(R) CPU
E5-2680 0 @ 2.70GHz<br>
- create_slave("hexagon-build-02",
properties={'jobs': 12, 'loadaverage': 32},<br>
- max_builds=4),<br>
- # Ubuntu 13.04 x86-64, Intel(R) Xeon(R) CPU
E5-2680 0 @ 2.70GHz<br>
- create_slave("hexagon-build-03",
properties={'jobs': 16, 'loadaverage': 32},<br>
- max_builds=2),<br>
+ create_slave("hexagon-build-02",
properties={'jobs': 12}, max_builds=4),<br>
# Cavium Octeon II V0.8, MIPS64 big endian,
Debian squeeze (6.0.6)<br>
create_slave("mipsswbrd002",
properties={'jobs' : 6}, max_builds=1),<br>
<br>
Modified:
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py<br>
URL: <a moz-do-not-send="true"
href="http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=194896&r1=194895&r2=194896&view=diff"
target="_blank">http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=194896&r1=194895&r2=194896&view=diff</a><br>
==============================================================================<br>
---
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
(original)<br>
+++
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
Fri Nov 15 18:12:47 2013<br>
@@ -10,10 +10,7 @@ from
zorg.buildbot.commands.LitTestComma<br>
def getClangAndLLDBuildFactory(<br>
clean=True,<br>
- Option=None,<br>
- env=None,<br>
- jobs="%(jobs)s",<br>
- loadaverage="%(loadaverage)s"):<br>
+ env=None):<br>
llvm_srcdir = "llvm.src"<br>
llvm_objdir = "llvm.obj"<br>
@@ -41,11 +38,11 @@ def getClangAndLLDBuildFactory(<br>
baseURL='<a moz-do-not-send="true"
href="http://llvm.org/svn/llvm-project/llvm/"
target="_blank">http://llvm.org/svn/llvm-project/llvm/</a>',<br>
defaultBranch='trunk',<br>
workdir=llvm_srcdir))<br>
- #f.addStep(SVN(name='svn-compiler-rt',<br>
- # mode='update',<br>
- # baseURL='<a moz-do-not-send="true"
href="http://llvm.org/svn/llvm-project/compiler-rt/"
target="_blank">http://llvm.org/svn/llvm-project/compiler-rt/</a>',<br>
- # defaultBranch='trunk',<br>
- # workdir='%s/projects/compiler-rt' %
llvm_srcdir))<br>
+ f.addStep(SVN(name='svn-compiler-rt',<br>
+ mode='update',<br>
+ baseURL='<a moz-do-not-send="true"
href="http://llvm.org/svn/llvm-project/compiler-rt/"
target="_blank">http://llvm.org/svn/llvm-project/compiler-rt/</a>',<br>
+ defaultBranch='trunk',<br>
+ workdir='%s/projects/compiler-rt' %
llvm_srcdir))<br>
f.addStep(SVN(name='svn-clang',<br>
mode='update',<br>
baseURL='<a moz-do-not-send="true"
href="http://llvm.org/svn/llvm-project/cfe/"
target="_blank">http://llvm.org/svn/llvm-project/cfe/</a>',<br>
@@ -78,23 +75,14 @@ def getClangAndLLDBuildFactory(<br>
description=["create
build dir"],<br>
workdir=".",<br>
env=merged_env))<br>
-<br>
- options = "-std=c++11 -Wdocumentation
-Wno-documentation-deprecated-sync "<br>
-<br>
- if (Option is not None):<br>
- options += Option<br>
-<br>
cmakeCommand = [<br>
"cmake",<br>
"-DCMAKE_BUILD_TYPE=Release",<br>
"-DLLVM_ENABLE_ASSERTIONS=ON",<br>
- "-DCMAKE_C_COMPILER=clang",<br>
- "-DCMAKE_CXX_COMPILER=clang++",<br>
- "-DCMAKE_CXX_FLAGS=\"%s\"" %(options),<br>
+ "-DCMAKE_CXX_FLAGS=\"-std=c++11 -Wdocumentation
-Wno-documentation-deprecated-sync\"",<br>
"-DLLVM_LIT_ARGS=\"-v\"",<br>
"-G", "Ninja",<br>
- "../%s" %(llvm_srcdir)]<br>
-<br>
+ "../%s" % llvm_srcdir]<br>
# Note: ShellCommand does not pass the params with
special symbols right.<br>
# The " ".join is a workaround for this bug.<br>
f.addStep(ShellCommand(name="cmake-configure",<br>
@@ -106,9 +94,7 @@ def getClangAndLLDBuildFactory(<br>
# Build everything.<br>
f.addStep(WarningCountingShellCommand(name="build",<br>
-
command=["ninja",<br>
- "-j %s"
%(jobs),<br>
- "-l %s"
%(loadaverage)],<br>
+
command=["nice", "-n", "10", "ninja"],<br>
haltOnFailure=True,<br>
description=["build"],<br>
workdir=llvm_objdir,<br>
@@ -116,10 +102,7 @@ def getClangAndLLDBuildFactory(<br>
# Test everything.<br>
f.addStep(LitTestCommand(name="test",<br>
- command=["ninja",<br>
- "-j %s" %(jobs),<br>
- "-l %s" %(loadaverage),<br>
- "check-all"],<br>
+ command=["nice", "-n",
"10", "ninja", "check-all"],<br>
haltOnFailure=True,<br>
description=["test"],<br>
workdir=llvm_objdir,<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a moz-do-not-send="true"
href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a moz-do-not-send="true"
href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits"
target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><span
class="HOEnZb"><font color="#888888"><br>
</font></span></blockquote>
<span class="HOEnZb"><font color="#888888"> <br>
<br>
-- <br>
Rick Foos<br>
Qualcomm Innovation Center, Inc. is a member of Code
Aurora Forum, hosted by The Linux Foundation<br>
<br>
</font></span></blockquote>
</div>
<br>
</div>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation</pre>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
llvm-commits mailing list
<a class="moz-txt-link-abbreviated" href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a>
<a class="moz-txt-link-freetext" href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a>
</pre>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation</pre>
</body>
</html>