From 9fd5e53f1dabc1035aae8d5d857bfb53aeb11707 Mon Sep 17 00:00:00 2001 From: Amaury de la Vieuville Date: Fri, 13 Sep 2013 10:59:01 +0000 Subject: [PATCH] Add "native" to config.available_features, to make it easier to disable non-x-compile-safe tests Patch by Artyom Skrobov! llvm-svn: 190679 --- llvm/test/ExecutionEngine/MCJIT/lit.local.cfg | 6 +++++- llvm/test/ExecutionEngine/lit.local.cfg | 4 ++++ llvm/test/lit.cfg | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg b/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg index bad4c8cf39ac..fdb36ee1d71c 100644 --- a/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg +++ b/llvm/test/ExecutionEngine/MCJIT/lit.local.cfg @@ -15,8 +15,12 @@ if root.host_arch not in ['i386', 'x86', 'x86_64', if 'armv7' in root.host_arch: config.unsupported = False -if 'i386-apple-darwin' in root.target_triple: +if 'i386-apple-darwin' in root.target_triple: config.unsupported = True if 'powerpc' in root.target_triple and not 'powerpc64' in root.target_triple: config.unsupported = True + +# ExecutionEngine tests are not expected to pass in a cross-compilation setup. +if 'native' not in config.available_features: + config.unsupported = True diff --git a/llvm/test/ExecutionEngine/lit.local.cfg b/llvm/test/ExecutionEngine/lit.local.cfg index 215ecaeeda0e..28c56ad9c5c2 100644 --- a/llvm/test/ExecutionEngine/lit.local.cfg +++ b/llvm/test/ExecutionEngine/lit.local.cfg @@ -3,3 +3,7 @@ if config.root.host_arch in ['PowerPC', 'AArch64', 'SystemZ']: if 'hexagon' in config.root.target_triple: config.unsupported = True + +# ExecutionEngine tests are not expected to pass in a cross-compilation setup. +if 'native' not in config.available_features: + config.unsupported = True diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg index 3ee9edc8e6a0..9e4e0b0229fe 100644 --- a/llvm/test/lit.cfg +++ b/llvm/test/lit.cfg @@ -279,6 +279,10 @@ if not 'hexagon' in config.target_triple: if config.have_zlib == "1": config.available_features.add("zlib") +# Native compilation: host arch == target arch +if config.host_arch in config.target_triple: + config.available_features.add("native") + # llc knows whether he is compiled with -DNDEBUG. import subprocess try: