Skip to content

Commit aa708ea

Browse files
committed
[lit] Rename config.targets_to_build => config.llvm_code_generators and allow it to actually take on a value.
Previously this variable was always just "". Now using the recent cmake changes that I made, we can just grab the proper values from LLVMConfig.cmake. I need this so that we can REQUIRES tests based on the code generators that LLVM was compiled with. To make it easy to show the dependency in the requires line, the requires pattern to use is: REQUIRES: CODEGENERATOR=...
1 parent e7ed09d commit aa708ea

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test/lit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ if platform.system() != 'Windows':
423423
config.available_features.add('crash-recovery')
424424

425425
# Add each available build target CPU as a feature.
426-
for target in config.targets_to_build.split():
427-
config.available_features.add(target)
426+
for target in config.llvm_code_generators:
427+
config.available_features.add("CODEGENERATOR=" + target)
428428

429429
# Add the run target CPU, OS, and pointer size as features.
430430
config.available_features.add("CPU=" + run_cpu)

test/lit.site.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ config.llvm_src_root = "@LLVM_MAIN_SRC_DIR@"
2020
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
2121
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
2222
config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
23+
config.llvm_code_generators = "@LLVM_TARGETS_TO_BUILD@".split(";")
2324
config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
2425
config.swift_src_root = lit_config.params.get("swift_src_root", "@SWIFT_SOURCE_DIR@")
2526
config.swift_obj_root = "@SWIFT_BINARY_DIR@"
2627
config.target_triple = "@TARGET_TRIPLE@"
27-
config.targets_to_build = "@TARGETS_TO_BUILD@"
2828
config.variant_triple = "@VARIANT_TRIPLE@"
2929
config.variant_sdk = "@VARIANT_SDK@"
3030
config.variant_suffix = "@VARIANT_SUFFIX@"

validation-test/lit.site.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ config.llvm_src_root = "@LLVM_MAIN_SRC_DIR@"
1919
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
2020
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
2121
config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
22+
config.llvm_code_generators = "@LLVM_TARGETS_TO_BUILD@".split(";")
2223
config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
2324
config.swift_src_root = "@SWIFT_SOURCE_DIR@"
2425
config.swift_obj_root = "@SWIFT_BINARY_DIR@"
2526
config.target_triple = "@TARGET_TRIPLE@"
26-
config.targets_to_build = "@TARGETS_TO_BUILD@"
2727
config.variant_triple = "@VARIANT_TRIPLE@"
2828
config.variant_suffix = "@VARIANT_SUFFIX@"
2929
config.variant_sdk = "@VARIANT_SDK@"

0 commit comments

Comments
 (0)