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

[Duncan P. N. Exon Smith]

Sorry I missed that in the commit message.  Thanks for asking.

r209934 moved the LTO build to phase 4, since it's taking "a long
time".  The libcxx builder has been failing for a few weeks now, which
has prevented the LTO build from running at all, so I reverted to get
some coverage until PR20183 [1] is fixed.

[1]: http://llvm.org/bugs/show_bug.cgi?id=20183

> On 2014-Jul-02, at 13:01, Rafael Espíndola <rafael.espindola at gmail.com> wrote:
> 
> what was wrong with it?
> 
> On 2 July 2014 15:02, Duncan P. N. Exon Smith <dexonsmith at apple.com> wrote:
>> 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,
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits