[Lldb-commits] [lldb] r154575 - in /lldb/branches/lldb-platform-work: ./ test/dotest.py

[Johnny Chen]

Author: johnny
Date: Wed Apr 11 20:06:57 2012
New Revision: 154575

URL: http://llvm.org/viewvc/llvm-project?rev=154575&view=rev
Log:
Merge changes from ToT:

svn merge -r 154538:154573 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/test/dotest.py

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 11 20:06:57 2012
@@ -1 +1 @@
-/lldb/trunk:154224-154538
+/lldb/trunk:154224-154573

Modified: lldb/branches/lldb-platform-work/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/dotest.py?rev=154575&r1=154574&r2=154575&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/dotest.py (original)
+++ lldb/branches/lldb-platform-work/test/dotest.py Wed Apr 11 20:06:57 2012
@@ -101,7 +101,7 @@
 # with the command line overriding the configFile.  When specified, they should be
 # of the list type.  For example, "-A x86_64^i386" => archs=['x86_64', 'i386'] and
 # "-C gcc^clang" => compilers=['gcc', 'clang'].
-archs = ['x86_64']
+archs = ['x86_64', 'i386']
 compilers = ['clang']
 
 # The arch might dictate some specific CFLAGS to be passed to the toolchain to build