[llvm-branch-commits] [llvm-branch] r168349 - in /llvm/branches/release_32: ./ test/ExecutionEngine/MCJIT/lit.local.cfg test/ExecutionEngine/lit.local.cfg

[Hal Finkel]

Author: hfinkel
Date: Mon Nov 19 21:40:57 2012
New Revision: 168349

URL: http://llvm.org/viewvc/llvm-project?rev=168349&view=rev
Log:
Merge in r168316 so that the proper JIT tests are run on PPC.

Modified:
    llvm/branches/release_32/   (props changed)
    llvm/branches/release_32/test/ExecutionEngine/MCJIT/lit.local.cfg
    llvm/branches/release_32/test/ExecutionEngine/lit.local.cfg

Propchange: llvm/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 19 21:40:57 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,167718-167719,167731,167743,167750,167784,167811,167817,167855,167942,167948,167966,168198
+/llvm/trunk:155241,167718-167719,167731,167743,167750,167784,167811,167817,167855,167942,167948,167966,168198,168316

Modified: llvm/branches/release_32/test/ExecutionEngine/MCJIT/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/test/ExecutionEngine/MCJIT/lit.local.cfg?rev=168349&r1=168348&r2=168349&view=diff
==============================================================================
--- llvm/branches/release_32/test/ExecutionEngine/MCJIT/lit.local.cfg (original)
+++ llvm/branches/release_32/test/ExecutionEngine/MCJIT/lit.local.cfg Mon Nov 19 21:40:57 2012
@@ -8,12 +8,13 @@
 root = getRoot(config)
 
 targets = set(root.targets_to_build.split())
-if ('X86' in targets) | ('ARM' in targets) | ('Mips' in targets):
+if ('X86' in targets) | ('ARM' in targets) | ('Mips' in targets) | \
+   ('PowerPC' in targets):
     config.unsupported = False
 else:
     config.unsupported = True
 
-if root.host_arch not in ['x86', 'x86_64', 'ARM', 'Mips']:
+if root.host_arch not in ['x86', 'x86_64', 'ARM', 'Mips', 'PowerPC']:
     config.unsupported = True
 
 if root.host_os in ['Darwin']:

Modified: llvm/branches/release_32/test/ExecutionEngine/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_32/test/ExecutionEngine/lit.local.cfg?rev=168349&r1=168348&r2=168349&view=diff
==============================================================================
--- llvm/branches/release_32/test/ExecutionEngine/lit.local.cfg (original)
+++ llvm/branches/release_32/test/ExecutionEngine/lit.local.cfg Mon Nov 19 21:40:57 2012
@@ -1 +1,12 @@
 config.suffixes = ['.ll', '.c', '.cpp']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+if root.host_arch in ['PowerPC']:
+    config.unsupported = True
+