diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-09-14 22:22:47 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-09-14 22:22:47 +0000 |
| commit | 9498119c5518801530e96998fba684b0c8ae64d1 (patch) | |
| tree | 60984ef4cf5c6a46b454eebe1dac27943d4c342a | |
| parent | 6d5fb90c19b334aca88b02f489f4d5f805a103ba (diff) | |
| download | compiler-rt-9498119c5518801530e96998fba684b0c8ae64d1.tar.gz | |
compiler-rt/builtins: Make check-builtins run tests on macOS.
Differential Revision: https://reviews.llvm.org/D66984
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@371926 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/builtins/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | test/builtins/Unit/lit.cfg.py | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/builtins/CMakeLists.txt b/test/builtins/CMakeLists.txt index 43b7e295a..b80b8a112 100644 --- a/test/builtins/CMakeLists.txt +++ b/test/builtins/CMakeLists.txt @@ -25,9 +25,12 @@ if (MSVC AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") endif() pythonize_bool(BUILTINS_IS_MSVC) -#TODO: Add support for Apple. -if (NOT APPLE) -foreach(arch ${BUILTIN_SUPPORTED_ARCH}) +set(BUILTIN_TEST_ARCH ${BUILTIN_SUPPORTED_ARCH}) +if(APPLE) + darwin_filter_host_archs(BUILTIN_SUPPORTED_ARCH BUILTIN_TEST_ARCH) +endif() + +foreach(arch ${BUILTIN_TEST_ARCH}) set(BUILTINS_TEST_TARGET_ARCH ${arch}) string(TOLOWER "-${arch}-${OS_NAME}" BUILTINS_TEST_CONFIG_SUFFIX) get_test_cc_for_arch(${arch} BUILTINS_TEST_TARGET_CC BUILTINS_TEST_TARGET_CFLAGS) @@ -49,7 +52,8 @@ foreach(arch ${BUILTIN_SUPPORTED_ARCH}) ) list(APPEND BUILTINS_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/Unit/${CONFIG_NAME}) endforeach() -endif() + +# TODO: Add support for running tests on iOS and iOS simulator. add_lit_testsuite(check-builtins "Running the Builtins tests" ${BUILTINS_TESTSUITES} diff --git a/test/builtins/Unit/lit.cfg.py b/test/builtins/Unit/lit.cfg.py index e290ce107..44b86f0d6 100644 --- a/test/builtins/Unit/lit.cfg.py +++ b/test/builtins/Unit/lit.cfg.py @@ -29,6 +29,9 @@ if is_msvc: base_lib = os.path.join(config.compiler_rt_libdir, "clang_rt.builtins%s.lib " % config.target_suffix) config.substitutions.append( ("%librt ", base_lib) ) +elif config.host_os == 'Darwin': + base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.osx.a ") + config.substitutions.append( ("%librt ", base_lib + ' -lSystem ') ) else: base_lib = os.path.join(config.compiler_rt_libdir, "libclang_rt.builtins%s.a" % config.target_suffix) |