[llvm-commits] [zorg] r104164 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/ClangBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed May 19 16:26:48 2010
New Revision: 104164

URL: http://llvm.org/viewvc/llvm-project?rev=104164&view=rev
Log:
buildbot: Run FreeBSD tests inside a PTY, to work around a sporadic slave disconnect.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=104164&r1=104163&r2=104164&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed May 19 16:26:48 2010
@@ -170,7 +170,7 @@
         {'name': "clang-i686-freebsd",
          'slavenames':["freebsd1"],
          'builddir':"clang-i686-freebsd",
-         'factory': ClangBuilder.getClangBuildFactory(clean=False)},
+         'factory': ClangBuilder.getClangBuildFactory(clean=False, use_pty_in_tests=True)},
         {'name' : "clang-i686-xp-msvc9",
          'slavenames' :['dunbar-win32-2'],
          'builddir' :"clang-i686-xp-msvc9",
@@ -238,6 +238,14 @@
 def _get_experimental_builders():
     return [
 
+        {'name' : "clang-i386-darwin10-selfhost-rel",
+         'slavenames' : ["dunbar-darwin10"],
+         'builddir' : "clang-i386-darwin10-selfhost-rel",
+         'factory' : ClangBuilder.getClangBuildFactory(triple='i386-apple-darwin10',
+                                                       useTwoStage=True,
+                                                       stage1_config='Release',
+                                                       stage2_config='Release'),
+         'category' : 'clang.exp' },
         {'name' : "clang-x86_64-darwin10-selfhost-rel",
          'slavenames' : ["dunbar-darwin10"],
          'builddir' : "clang-x86_64-darwin10-selfhost-rel",

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=104164&r1=104163&r2=104164&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed May 19 16:26:48 2010
@@ -19,7 +19,7 @@
                          completely_clean=False, always_install=False,
                          make='make', jobs="%(jobs)s",
                          stage1_config='Debug', stage2_config='Release',
-                         extra_configure_args=[]):
+                         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
     if inDir:
@@ -128,11 +128,13 @@
                                    command=[make, "check-lit", "VERBOSE=1"],
                                    description=["testing", "llvm"],
                                    descriptionDone=["test", "llvm"],
-                                   workdir=llvm_1_objdir))
+                                   workdir=llvm_1_objdir,
+                                   usePTY=use_pty_in_tests))
         f.addStep(ClangTestCommand(name='test-clang',
                                    command=[make, 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
                                             WithProperties('EXTRA_TESTDIRS=%s' % extraTestDirs)],
-                                   workdir='%s/tools/clang' % llvm_1_objdir))
+                                   workdir='%s/tools/clang' % llvm_1_objdir,
+                                   usePTY=use_pty_in_tests))
 
     # Install llvm and clang.
     if llvm_1_installdir:
@@ -189,11 +191,13 @@
                                    command=[make, "check-lit", "VERBOSE=1"],
                                    description=["testing", "llvm"],
                                    descriptionDone=["test", "llvm"],
-                                   workdir=llvm_2_objdir))
+                                   workdir=llvm_2_objdir,
+                                   usePTY=use_pty_in_tests))
         f.addStep(ClangTestCommand(name='test-clang',
                                    command=[make, 'test', WithProperties('TESTARGS=%s' % clangTestArgs),
                                             WithProperties('EXTRA_TESTDIRS=%s' % extraTestDirs)],
-                                   workdir='%s/tools/clang' % llvm_2_objdir))
+                                   workdir='%s/tools/clang' % llvm_2_objdir,
+                                   usePTY=use_pty_in_tests))
 
     # Install clang (stage 2).
     f.addStep(ShellCommand(name="rm-install.clang.stage2",