File tree Expand file tree Collapse file tree 7 files changed +16
-3
lines changed Expand file tree Collapse file tree 7 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -12,10 +12,14 @@ config.library_dir = "@LIBOMP_LIBRARY_DIR@"
1212config.ompd_library_dir = "@CMAKE_CURRENT_BINARY_DIR@/../src/"
1313config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
1414config.operating_system = "@CMAKE_SYSTEM_NAME@"
15+ config.target_triple = "@LLVM_TARGET_TRIPLE@"
1516
1617config.ompt_plugin = "@OMPT_PLUGIN@"
1718config.ompt_include_dir = "@LIBOMP_INCLUDE_DIR@"
1819config.ompd_module = "@CMAKE_CURRENT_BINARY_DIR@/../gdb-plugin/python-module/ompd/"
1920
21+ import lit.llvm
22+ lit.llvm.initialize(lit_config, config)
23+
2024# Let the main config do the real work.
2125lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
Original file line number Diff line number Diff line change @@ -70,7 +70,6 @@ if config.operating_system != 'Haiku':
7070 libs += " -latomic"
7171
7272# Allow REQUIRES / UNSUPPORTED / XFAIL to work
73- config .target_triple = [ ]
7473for feature in config .test_compiler_features :
7574 config .available_features .add (feature )
7675
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1212config.library_dir = "@LIBOMP_LIBRARY_DIR@"
1313config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
1414config.operating_system = "@CMAKE_SYSTEM_NAME@"
15+ config.target_triple = "@LLVM_TARGET_TRIPLE@"
1516config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
1617config.using_hwloc = @LIBOMP_USE_HWLOC@
1718config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_OPTIONAL@
@@ -24,5 +25,8 @@ config.target_arch = "@LIBOMP_ARCH@"
2425config.compiler_frontend_variant = "@CMAKE_C_COMPILER_FRONTEND_VARIANT@"
2526config.compiler_simulate_id = "@CMAKE_C_SIMULATE_ID@"
2627
28+ import lit.llvm
29+ lit.llvm.initialize(lit_config, config)
30+
2731# Let the main config do the real work.
2832lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")
Original file line number Diff line number Diff line change @@ -58,7 +58,6 @@ if config.has_libatomic:
5858 libs += " -latomic"
5959
6060# Allow XFAIL to work
61- config .target_triple = [ ]
6261for feature in config .test_compiler_features :
6362 config .available_features .add (feature )
6463
Original file line number Diff line number Diff line change @@ -11,11 +11,15 @@ config.libomp_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1111config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
1212config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
1313config.operating_system = "@CMAKE_SYSTEM_NAME@"
14+ config.target_triple = "@LLVM_TARGET_TRIPLE@"
1415config.has_libatomic = @LIBARCHER_HAVE_LIBATOMIC@
1516config.has_tsan = @OPENMP_TEST_ENABLE_TSAN@
1617
1718config.test_archer_flags = "@LIBARCHER_TEST_FLAGS@"
1819config.libarcher_obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
1920
21+ import lit.llvm
22+ lit.llvm.initialize(lit_config, config)
23+
2024# Let the main config do the real work.
2125lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
Original file line number Diff line number Diff line change @@ -63,7 +63,6 @@ if 'CHECK_OPENMP_ENV' in os.environ:
6363 config .environment [name ] = value
6464
6565# Allow XFAIL to work
66- config .target_triple = [ ]
6766for feature in config .test_compiler_features :
6867 config .available_features .add (feature )
6968
Original file line number Diff line number Diff line change @@ -11,6 +11,10 @@ config.omp_library_dir = "@LIBOMP_LIBRARY_DIR@"
1111config.omp_header_dir = "@LIBOMP_INCLUDE_DIR@"
1212config.ompt_print_callback_dir = "@OMPT_PRINT_CALLBACKS_DIR@"
1313config.operating_system = "@CMAKE_SYSTEM_NAME@"
14+ config.target_triple = "@LLVM_TARGET_TRIPLE@"
15+
16+ import lit.llvm
17+ lit.llvm.initialize(lit_config, config)
1418
1519# Let the main config do the real work.
1620lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
You can’t perform that action at this time.
0 commit comments