[llvm-commits] [zorg] r108355 - in /zorg/trunk/zorg/buildbot/builders: ClangBuilder.py DragonEggBuilder.py Util.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jul 14 15:34:16 2010
New Revision: 108355

URL: http://llvm.org/viewvc/llvm-project?rev=108355&view=rev
Log:
Tweak buildbot config a bit for +Asserts change.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
    zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
    zorg/trunk/zorg/buildbot/builders/Util.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=108355&r1=108354&r2=108355&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jul 14 15:34:16 2010
@@ -18,7 +18,8 @@
                          valgrindLeakCheck=False, outOfDir=False, useTwoStage=False,
                          completely_clean=False, always_install=False,
                          make='make', jobs="%(jobs)s",
-                         stage1_config='Debug+Asserts', stage2_config='Release+Asserts',
+                         stage1_config='Debug+Asserts',
+                         stage2_config='Release+Asserts',
                          extra_configure_args=[], use_pty_in_tests=False):
     # Don't use in-dir builds with a two stage build process.
     inDir = not outOfDir and not useTwoStage

Modified: zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py?rev=108355&r1=108354&r2=108355&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/DragonEggBuilder.py Wed Jul 14 15:34:16 2010
@@ -180,7 +180,7 @@
                        WithProperties("CC=%(builddir)s/gcc.1.install/bin/gcc"),
                        WithProperties("CXX=%(builddir)s/gcc.1.install/bin/g++"),
                        WithProperties("GCC=%(builddir)s/gcc.1.install/bin/gcc"),
-                       WithProperties("LLVM_CONFIG=%(builddir)s/llvm.1.obj/Debug/bin/llvm-config"),
+                       WithProperties("LLVM_CONFIG=%(builddir)s/llvm.1.obj/Debug+Asserts/bin/llvm-config"),
                        ],
             haltOnFailure = True,
             description=["compile", "dragonegg", "(stage 1)"],

Modified: zorg/trunk/zorg/buildbot/builders/Util.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Util.py?rev=108355&r1=108354&r2=108355&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Util.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Util.py Wed Jul 14 15:34:16 2010
@@ -9,10 +9,14 @@
   else:
     raise ValueError,'Unknown config name: %r' % origname
 
-  args.append('--disable-assertions')
   if name.startswith('+Asserts'):
     name = name[len('+Asserts'):]
     args.append('--enable-assertions')
+  elif name.startswith('-Asserts'):
+    name = name[len('-Asserts'):]
+    args.append('--disable-assertions')
+  else:
+    args.append('--disable-assertions')
 
   if name.startswith('+Checks'):
     name = name[len('+Checks'):]