[PATCH] D96494: [dexter] Force dexter tests to use the host triple

[Orlando Cazalet-Hyams via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG52bc1c1bd539: [dexter] Force dexter tests to use the host triple (authored by Orlando).
Herald added a subscriber: llvm-commits.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D96494/new/

https://reviews.llvm.org/D96494

Files:
  debuginfo-tests/dexter-tests/lit.local.cfg
  debuginfo-tests/dexter/feature_tests/lit.local.cfg
  debuginfo-tests/lit.cfg.py
  debuginfo-tests/lit.site.cfg.py.in


Index: debuginfo-tests/lit.site.cfg.py.in
===================================================================
--- debuginfo-tests/lit.site.cfg.py.in
+++ debuginfo-tests/lit.site.cfg.py.in
@@ -3,6 +3,7 @@
 import sys
 import lit.util
 
+config.targets_to_build = "@TARGETS_TO_BUILD@".split()
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
Index: debuginfo-tests/lit.cfg.py
===================================================================
--- debuginfo-tests/lit.cfg.py
+++ debuginfo-tests/lit.cfg.py
@@ -81,9 +81,41 @@
     # Propagate path to symbolizer for ASan/MSan.
     llvm_config.with_system_environment(
         ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH'])
-llvm_config.with_environment('PATHTOCLANG', llvm_config.config.clang)
-llvm_config.with_environment('PATHTOCLANGPP', llvm_config.use_llvm_tool('clang++'))
-llvm_config.with_environment('PATHTOCLANGCL', llvm_config.use_llvm_tool('clang-cl'))
+
+def add_host_triple(clang):
+  return '{} --target={}'.format(clang, config.host_triple)
+
+# The set of arches we can build.
+targets = set(config.targets_to_build)
+# Add aliases to the target set.
+if 'AArch64' in targets:
+  targets.add('arm64')
+if 'ARM' in config.targets_to_build:
+  targets.add('thumbv7')
+
+def can_target_host():
+  # Check if the targets set contains anything that looks like our host arch.
+  # The arch name in the triple and targets set may be spelled differently
+  # (e.g. x86 vs X86).
+  return any(config.host_triple.lower().startswith(x.lower())
+             for x in targets)
+
+# Dexter tests run on the host machine. If the host arch is supported add
+# 'dexter' as an available feature and force the dexter tests to use the host
+# triple.
+if can_target_host():
+  config.available_features.add('dexter')
+  if config.host_triple != config.target_triple:
+    print('Forcing dexter tests to use host triple {}.'.format(config.host_triple))
+  llvm_config.with_environment('PATHTOCLANG',
+                               add_host_triple(llvm_config.config.clang))
+  llvm_config.with_environment('PATHTOCLANGPP',
+                               add_host_triple(llvm_config.use_llvm_tool('clang++')))
+  llvm_config.with_environment('PATHTOCLANGCL',
+                               add_host_triple(llvm_config.use_llvm_tool('clang-cl')))
+else:
+  print('Host triple {} not supported. Skipping dexter tests in the '
+        'debuginfo-tests project.'.format(config.host_triple))
 
 # Check which debuggers are available:
 built_lldb = llvm_config.use_llvm_tool('lldb', search_env='CLANG')
Index: debuginfo-tests/dexter/feature_tests/lit.local.cfg
===================================================================
--- debuginfo-tests/dexter/feature_tests/lit.local.cfg
+++ debuginfo-tests/dexter/feature_tests/lit.local.cfg
@@ -1,2 +1,5 @@
+if 'dexter' not in config.available_features:
+    config.unsupported = True
+
 config.name = "DExTer feature tests"
 config.suffixes = ['.cpp', '.c', '.test']
Index: debuginfo-tests/dexter-tests/lit.local.cfg
===================================================================
--- /dev/null
+++ debuginfo-tests/dexter-tests/lit.local.cfg
@@ -0,0 +1,2 @@
+if 'dexter' not in config.available_features:
+    config.unsupported = True


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D96494.326039.patch
Type: text/x-patch
Size: 3316 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210224/b85fae47/attachment.bin>