diff options
| author | Vedant Kumar <vsk@apple.com> | 2017-09-13 21:57:47 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2017-09-13 21:57:47 +0000 |
| commit | 2984766b09a658f5fddc5dc4d24554b12f176fa0 (patch) | |
| tree | e68ac4ccae2cbbb93f9e8f72635416deee40156f /test/ubsan_minimal | |
| parent | 90837bb59a2e12708c48f47e4c1dc425564c45b7 (diff) | |
[ubsan-minimal] Filter targets to test by host arch on Darwin
This reverts r313189, and adds a use of darwin_filter_host_archs() for
ubsan-minimal.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313206 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ubsan_minimal')
| -rw-r--r-- | test/ubsan_minimal/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/ubsan_minimal/lit.common.cfg | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/ubsan_minimal/CMakeLists.txt b/test/ubsan_minimal/CMakeLists.txt index 8e87b76bc..712654e94 100644 --- a/test/ubsan_minimal/CMakeLists.txt +++ b/test/ubsan_minimal/CMakeLists.txt @@ -1,6 +1,9 @@ set(UBSAN_LIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_ARCH}) +if(APPLE) + darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH) +endif() set(UBSAN_TESTSUITES) set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) diff --git a/test/ubsan_minimal/lit.common.cfg b/test/ubsan_minimal/lit.common.cfg index 5fa44c770..e8b42bb82 100644 --- a/test/ubsan_minimal/lit.common.cfg +++ b/test/ubsan_minimal/lit.common.cfg @@ -37,9 +37,4 @@ if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windo if '-arch x86_64h' in target_cflags and 'x86_64h' not in config.available_features: config.unsupported = True -# Temporarily disable all x86_64h testing on Darwin to unblock the public bots, -# while we investigate rdar://problem/34409349 -if config.host_os == 'Darwin' and 'x86_64h' in target_cflags: - config.unsupported = True - config.available_features.add('arch=' + config.target_arch) |