pyrox.dev
1From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
2From: Will Dietz <w@wdtz.org>
3Date: Tue, 19 Sep 2017 13:13:06 -0500
4Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
5 needs it
6
7---
8 cmake/Modules/AddCompilerRT.cmake | 8 ------
9 test/asan/CMakeLists.txt | 52 ---------------------------------------
10 test/tsan/CMakeLists.txt | 47 -----------------------------------
11 3 files changed, 107 deletions(-)
12
13diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
14index bc5fb9ff7..b64eb4246 100644
15--- a/cmake/Modules/AddCompilerRT.cmake
16+++ b/cmake/Modules/AddCompilerRT.cmake
17@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
18 set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
19 set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
20 endif()
21- if(APPLE)
22- # Ad-hoc sign the dylibs
23- add_custom_command(TARGET ${libname}
24- POST_BUILD
25- COMMAND codesign --sign - $<TARGET_FILE:${libname}>
26- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
27- )
28- endif()
29 endif()
30 install(TARGETS ${libname}
31 ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
32diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
33index 8bfc15b5c..f23d0f71a 100644
34--- a/test/asan/CMakeLists.txt
35+++ b/test/asan/CMakeLists.txt
36@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH})
37 endif()
38 endforeach()
39
40-# iOS and iOS simulator test suites
41-# These are not added into "check-all", in order to run these tests, use
42-# "check-asan-iossim-x86_64" and similar. They also require that an extra env
43-# variable to select which iOS device or simulator to use, e.g.:
44-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
45-if(APPLE)
46- set(EXCLUDE_FROM_ALL ON)
47-
48- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
49- set(ASAN_TEST_IOS "1")
50- pythonize_bool(ASAN_TEST_IOS)
51- set(ASAN_TEST_DYNAMIC True)
52-
53- foreach(arch ${DARWIN_iossim_ARCHS})
54- set(ASAN_TEST_IOSSIM "1")
55- pythonize_bool(ASAN_TEST_IOSSIM)
56- set(ASAN_TEST_TARGET_ARCH ${arch})
57- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
58- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
59- get_bits_for_arch(${arch} ASAN_TEST_BITS)
60- string(TOUPPER ${arch} ARCH_UPPER_CASE)
61- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
62- configure_lit_site_cfg(
63- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
64- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
65- )
66- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests"
67- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
68- DEPENDS ${ASAN_TEST_DEPS})
69- endforeach()
70-
71- foreach (arch ${DARWIN_ios_ARCHS})
72- set(ASAN_TEST_IOSSIM "0")
73- pythonize_bool(ASAN_TEST_IOSSIM)
74- set(ASAN_TEST_TARGET_ARCH ${arch})
75- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
76- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
77- get_bits_for_arch(${arch} ASAN_TEST_BITS)
78- string(TOUPPER ${arch} ARCH_UPPER_CASE)
79- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
80- configure_lit_site_cfg(
81- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
82- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
83- )
84- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests"
85- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
86- DEPENDS ${ASAN_TEST_DEPS})
87- endforeach()
88-
89- set(EXCLUDE_FROM_ALL OFF)
90-endif()
91-
92 # Add unit tests.
93 if(COMPILER_RT_INCLUDE_TESTS)
94 set(ASAN_TEST_DYNAMIC False)
95diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
96index a68908612..cde0accb5 100644
97--- a/test/tsan/CMakeLists.txt
98+++ b/test/tsan/CMakeLists.txt
99@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH})
100 list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
101 endforeach()
102
103-# iOS and iOS simulator test suites
104-# These are not added into "check-all", in order to run these tests, use
105-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment
106-# variable to select which iOS device or simulator to use, e.g.:
107-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
108-if(APPLE)
109- set(EXCLUDE_FROM_ALL ON)
110-
111- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
112- set(TSAN_TEST_IOS "1")
113- pythonize_bool(TSAN_TEST_IOS)
114-
115- set(arch "x86_64")
116- set(TSAN_TEST_IOSSIM "1")
117- pythonize_bool(TSAN_TEST_IOSSIM)
118- set(TSAN_TEST_TARGET_ARCH ${arch})
119- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
120- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
121- string(TOUPPER ${arch} ARCH_UPPER_CASE)
122- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
123- configure_lit_site_cfg(
124- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
125- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
126- )
127- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
128- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
129- DEPENDS ${TSAN_TEST_DEPS})
130-
131- set(arch "arm64")
132- set(TSAN_TEST_IOSSIM "0")
133- pythonize_bool(TSAN_TEST_IOSSIM)
134- set(TSAN_TEST_TARGET_ARCH ${arch})
135- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
136- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
137- string(TOUPPER ${arch} ARCH_UPPER_CASE)
138- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
139- configure_lit_site_cfg(
140- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
141- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
142- )
143- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
144- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
145- DEPENDS ${TSAN_TEST_DEPS})
146-
147- set(EXCLUDE_FROM_ALL OFF)
148-endif()
149-
150 if(COMPILER_RT_INCLUDE_TESTS)
151 configure_lit_site_cfg(
152 ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
153--
1542.14.1
155