Skip to content

Commit c007b21

Browse files
authored
Update the libc++/c++abi/unwind check for the Arm/Aarch64 cross toolchain builders. (llvm#259)
Just return back to use `check-<lib>-<target-triple>` checks for the libc++/c++abi/unwind tests for the cross platform toolchain builders on Windows build hosts.
1 parent bce5065 commit c007b21

File tree

2 files changed

+14
-70
lines changed

2 files changed

+14
-70
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -206,23 +206,9 @@
206206
"check-clang",
207207
"check-lld",
208208
"check-compiler-rt-armv7-unknown-linux-gnueabihf",
209-
],
210-
checks_on_target = [
211-
("libunwind",
212-
["python", "bin/llvm-lit.py",
213-
"-v", "-vv", "--threads=32", "--time-tests",
214-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test",
215-
]),
216-
("libc++abi",
217-
["python", "bin/llvm-lit.py",
218-
"-v", "-vv", "--threads=32", "--time-tests",
219-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test",
220-
]),
221-
("libc++",
222-
["python", "bin/llvm-lit.py",
223-
"-v", "-vv", "--threads=32", "--time-tests",
224-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test",
225-
])
209+
"check-unwind-armv7-unknown-linux-gnueabihf",
210+
"check-cxxabi-armv7-unknown-linux-gnueabihf",
211+
"check-cxx-armv7-unknown-linux-gnueabihf",
226212
],
227213
cmake_definitions = {
228214
"LLVM_TARGETS_TO_BUILD" : "ARM",
@@ -270,24 +256,10 @@
270256
"check-llvm",
271257
"check-clang",
272258
"check-lld",
273-
"check-compiler-rt-aarch64-unknown-linux-gnu"
274-
],
275-
checks_on_target = [
276-
("libunwind",
277-
["python", "bin/llvm-lit.py",
278-
"-v", "-vv", "--threads=32", "--time-tests",
279-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test",
280-
]),
281-
("libc++abi",
282-
["python", "bin/llvm-lit.py",
283-
"-v", "-vv", "--threads=32", "--time-tests",
284-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test",
285-
]),
286-
("libc++",
287-
["python", "bin/llvm-lit.py",
288-
"-v", "-vv", "--threads=32", "--time-tests",
289-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test",
290-
])
259+
"check-compiler-rt-aarch64-unknown-linux-gnu",
260+
"check-unwind-aarch64-unknown-linux-gnu",
261+
"check-cxxabi-aarch64-unknown-linux-gnu",
262+
"check-cxx-aarch64-unknown-linux-gnu",
291263
],
292264
cmake_definitions = {
293265
"LLVM_TARGETS_TO_BUILD" : "AArch64",

buildbot/osuosl/master/config/release_builders.py

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -122,23 +122,9 @@
122122
"check-clang",
123123
"check-lld",
124124
"check-compiler-rt-armv7-unknown-linux-gnueabihf",
125-
],
126-
checks_on_target = [
127-
("libunwind",
128-
["python", "bin/llvm-lit.py",
129-
"-v", "-vv", "--threads=32", "--time-tests",
130-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test",
131-
]),
132-
("libc++abi",
133-
["python", "bin/llvm-lit.py",
134-
"-v", "-vv", "--threads=32", "--time-tests",
135-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test",
136-
]),
137-
("libc++",
138-
["python", "bin/llvm-lit.py",
139-
"-v", "-vv", "--threads=32", "--time-tests",
140-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test",
141-
])
125+
"check-unwind-armv7-unknown-linux-gnueabihf",
126+
"check-cxxabi-armv7-unknown-linux-gnueabihf",
127+
"check-cxx-armv7-unknown-linux-gnueabihf",
142128
],
143129
cmake_definitions = {
144130
"LLVM_TARGETS_TO_BUILD" : "ARM",
@@ -186,24 +172,10 @@
186172
"check-llvm",
187173
"check-clang",
188174
"check-lld",
189-
"check-compiler-rt-aarch64-unknown-linux-gnu"
190-
],
191-
checks_on_target = [
192-
("libunwind",
193-
["python", "bin/llvm-lit.py",
194-
"-v", "-vv", "--threads=32", "--time-tests",
195-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test",
196-
]),
197-
("libc++abi",
198-
["python", "bin/llvm-lit.py",
199-
"-v", "-vv", "--threads=32", "--time-tests",
200-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test",
201-
]),
202-
("libc++",
203-
["python", "bin/llvm-lit.py",
204-
"-v", "-vv", "--threads=32", "--time-tests",
205-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test",
206-
])
175+
"check-compiler-rt-aarch64-unknown-linux-gnu",
176+
"check-unwind-aarch64-unknown-linux-gnu",
177+
"check-cxxabi-aarch64-unknown-linux-gnu",
178+
"check-cxx-aarch64-unknown-linux-gnu",
207179
],
208180
cmake_definitions = {
209181
"LLVM_TARGETS_TO_BUILD" : "AArch64",

0 commit comments

Comments
 (0)