[zorg] r212207 - Revert "llvmlab: Move the LTO build to phase 4 and libc++ tests to phase 3"

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Wed Jul  2 14:02:42 2014
New Revision: 212207

URL: http://llvm.org/viewvc/llvm-project?rev=212207&view=rev
Log:
Revert "llvmlab: Move the LTO build to phase 4 and libc++ tests to phase 3"

This reverts commit r209934.

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/phase_config.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/phase_config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/phase_config.py?rev=212207&r1=212206&r2=212207&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/phase_config.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/phase_config.py Wed Jul  2 14:02:42 2014
@@ -73,17 +73,18 @@ The second phase is targeted to run on m
 # Phase 3
 
 phase3_slaves = ['xserve2','xserve4']
+phase3_slaves_lto = ['xserve3']
 phase3_builders = []
 
-# Run the libc++ tests.
-phase3_builders.append(test('libcxx_clang-x86_64-darwin11-RA', phase3_slaves))
-
 # Add an i386 build.
 phase3_builders.append(build('clang-i386-darwin11-RA', phase3_slaves))
 
 # Add a release (no asserts) build.
 phase3_builders.append(build('clang-x86_64-darwin11-R', phase3_slaves))
 
+# Add an lto release build.
+phase3_builders.append(build('clang-x86_64-darwin11-Rlto', phase3_slaves_lto))
+
 phases.append(
     { 'number' : 3,
       'name' : 'tree health',
@@ -101,11 +102,10 @@ The third phase is targeted to react wit
 
 # Phase 4
 
-phase4_slaves = ['xserve3']
+phase4_slaves = ['xserve4']
 phase4_builders = []
 
-# Add an lto release build.
-phase4_builders.append(build('clang-x86_64-darwin11-Rlto', phase4_slaves))
+phase4_builders.append(test('libcxx_clang-x86_64-darwin11-RA', phase4_slaves))
 
 phases.append(
     { 'number' : 4,