[zorg] r194896 - Reverted r194758. Please see http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-ubuntu-13.04/builds/9304/steps/build/logs/stdio for the problem.
Rick Foos
rfoos at codeaurora.org
Fri Nov 15 17:09:56 PST 2013
Patch is posted. I'm going to drive home, get some dinner, and check
back in a bit.
Thanks for all your help,
Rick
On 11/15/2013 06:12 PM, Galina Kistanova wrote:
> Author: gkistanova
> Date: Fri Nov 15 18:12:47 2013
> New Revision: 194896
>
> URL: http://llvm.org/viewvc/llvm-project?rev=194896&view=rev
> Log:
> Reverted r194758. Please see http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-ubuntu-13.04/builds/9304/steps/build/logs/stdio for the problem.
>
> Modified:
> zorg/trunk/buildbot/osuosl/master/config/builders.py
> zorg/trunk/buildbot/osuosl/master/config/slaves.py
> zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
>
> 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=194896&r1=194895&r2=194896&view=diff
> ==============================================================================
> --- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
> +++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Nov 15 18:12:47 2013
> @@ -623,12 +623,6 @@ def _get_sanitizer_builders():
> 'slavenames' :["sanitizer-buildbot2"],
> 'builddir': "sanitizer-x86_64-linux-bootstrap",
> 'factory': SanitizerBuilder.getSanitizerBuildFactory()},
> - {'name': "llvm-clang-lld-x86_64-ubuntu-13.04-sanitize-address",
> - 'slavenames':["hexagon-build-03"],
> - 'builddir':"llvm-clang-lld-x86_64-ubuntu-13.04-fsanitize-address",
> - 'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(Option='-fsanitize=address',
> - env={'PATH':'/opt/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games'},
> - jobs=12,loadaverage=32)},
> ]
>
> # Experimental and stopped builders
>
> Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=194896&r1=194895&r2=194896&view=diff
> ==============================================================================
> --- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
> +++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Nov 15 18:12:47 2013
> @@ -188,11 +188,7 @@ def get_build_slaves():
> create_slave("osu8", properties={'jobs' : 6}, max_builds=2),
>
> # Ubuntu 12.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
> - create_slave("hexagon-build-02", properties={'jobs': 12, 'loadaverage': 32},
> - max_builds=4),
> - # Ubuntu 13.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
> - create_slave("hexagon-build-03", properties={'jobs': 16, 'loadaverage': 32},
> - max_builds=2),
> + create_slave("hexagon-build-02", properties={'jobs': 12}, max_builds=4),
>
> # Cavium Octeon II V0.8, MIPS64 big endian, Debian squeeze (6.0.6)
> create_slave("mipsswbrd002", properties={'jobs' : 6}, max_builds=1),
>
> Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=194896&r1=194895&r2=194896&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Fri Nov 15 18:12:47 2013
> @@ -10,10 +10,7 @@ from zorg.buildbot.commands.LitTestComma
>
> def getClangAndLLDBuildFactory(
> clean=True,
> - Option=None,
> - env=None,
> - jobs="%(jobs)s",
> - loadaverage="%(loadaverage)s"):
> + env=None):
>
> llvm_srcdir = "llvm.src"
> llvm_objdir = "llvm.obj"
> @@ -41,11 +38,11 @@ def getClangAndLLDBuildFactory(
> baseURL='http://llvm.org/svn/llvm-project/llvm/',
> defaultBranch='trunk',
> workdir=llvm_srcdir))
> - #f.addStep(SVN(name='svn-compiler-rt',
> - # mode='update',
> - # baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
> - # defaultBranch='trunk',
> - # workdir='%s/projects/compiler-rt' % llvm_srcdir))
> + f.addStep(SVN(name='svn-compiler-rt',
> + mode='update',
> + baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
> + defaultBranch='trunk',
> + workdir='%s/projects/compiler-rt' % llvm_srcdir))
> f.addStep(SVN(name='svn-clang',
> mode='update',
> baseURL='http://llvm.org/svn/llvm-project/cfe/',
> @@ -78,23 +75,14 @@ def getClangAndLLDBuildFactory(
> description=["create build dir"],
> workdir=".",
> env=merged_env))
> -
> - options = "-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync "
> -
> - if (Option is not None):
> - options += Option
> -
> cmakeCommand = [
> "cmake",
> "-DCMAKE_BUILD_TYPE=Release",
> "-DLLVM_ENABLE_ASSERTIONS=ON",
> - "-DCMAKE_C_COMPILER=clang",
> - "-DCMAKE_CXX_COMPILER=clang++",
> - "-DCMAKE_CXX_FLAGS=\"%s\"" %(options),
> + "-DCMAKE_CXX_FLAGS=\"-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync\"",
> "-DLLVM_LIT_ARGS=\"-v\"",
> "-G", "Ninja",
> - "../%s" %(llvm_srcdir)]
> -
> + "../%s" % llvm_srcdir]
> # Note: ShellCommand does not pass the params with special symbols right.
> # The " ".join is a workaround for this bug.
> f.addStep(ShellCommand(name="cmake-configure",
> @@ -106,9 +94,7 @@ def getClangAndLLDBuildFactory(
>
> # Build everything.
> f.addStep(WarningCountingShellCommand(name="build",
> - command=["ninja",
> - "-j %s" %(jobs),
> - "-l %s" %(loadaverage)],
> + command=["nice", "-n", "10", "ninja"],
> haltOnFailure=True,
> description=["build"],
> workdir=llvm_objdir,
> @@ -116,10 +102,7 @@ def getClangAndLLDBuildFactory(
>
> # Test everything.
> f.addStep(LitTestCommand(name="test",
> - command=["ninja",
> - "-j %s" %(jobs),
> - "-l %s" %(loadaverage),
> - "check-all"],
> + command=["nice", "-n", "10", "ninja", "check-all"],
> haltOnFailure=True,
> description=["test"],
> workdir=llvm_objdir,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
--
Rick Foos
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
More information about the llvm-commits
mailing list